revert parts of #219

Went a little overboard with the search + replace, we define #deliver in our notification classes
upgrade serve_static_assets for 4.2
Downstream changes
Conditionally show google and github logins based on configuration
Check for the presence of ENV variables for email config
Bad merge
Switch to using AUTH_ ENV variables
Default auth to true
Remove mime-types gem
More email addresses which should load from config
Use rails root for folder path, just because @steved555 did it for flowdock in 1dbdeff3
Merge pull request #220 from zendesk/jsmale/downstream

Downstream changes and extract email sender domain
make sure cached pages change with project permalink
Merge pull request #221 from zendesk/sdavidovitz/project_permalink_change

make sure cached pages change with project permalink
Merge branch 'master' into fneves/autocomplete_tags_on_deploy

Conflicts:
	config/application.rb
	test/models/project_test.rb