Merge remote-tracking branch 'ryandub/master'

Fixed Conflicts:
	attributes/default.rb
	recipes/default.rb
	recipes/upload.rb
	templates/default/passenger_upstart.conf.erb