Update .travis.yml
Update _form.html.erb
Bundle update
Merge branch 'master' of github.com:ZeusWPI/Gandalf
Remove Puma, add Passenger
Update year at bottom (closes #461)
Update .travis.yml
Only send partner mails on create, update and manual (closes #457)
Merge pull request #464 from ZeusWPI/fix/457/dont-resend-partner-mails-automatically

Only send partner mails on create, update and manual (closes #457)
Merge branch 'master' into advanced-partners

Conflicts:
	app/controllers/partners_controller.rb