Add deploy settings
Merge branch 'master' of https://github.com/jhn/forfreeplease

Conflicts:
	config/deploy.rb