Simple installation
Merge branch 'master' into store-main-password-as-sha1

Conflicts:
	lib/chupacabra/system.rb