Conflicts:
	features/step_definitions/apt.rb
	features/step_definitions/checks.rb
	features/step_definitions/common_steps.rb
	features/step_definitions/encryption.rb
	features/step_definitions/erase_memory.rb
	features/step_definitions/firewall_leaks.rb
	features/step_definitions/git.rb
	features/step_definitions/i2p.rb
	features/step_definitions/pidgin.rb
	features/step_definitions/root_access_control.rb
	features/step_definitions/ssh.rb
	features/step_definitions/tor.rb
	features/step_definitions/torified_gnupg.rb
	features/step_definitions/torified_misc.rb
	features/step_definitions/unsafe_browser.rb
	features/step_definitions/usb.rb
	features/support/helpers/misc_helpers.rb