Conflicts:
	features/step_definitions/common_steps.rb
	features/step_definitions/firewall_leaks.rb
	features/step_definitions/pidgin.rb
	features/step_definitions/time_syncing.rb
	features/step_definitions/torified_gnupg.rb
	features/step_definitions/torified_misc.rb
	features/time_syncing.feature
	features/torified_browsing.feature

Includes s/@vm/$vm/ fixes, removal of "next if @skip_..." lines and
adaptations of new scenarios to use the appropriate
snapshots.