heroku mods
db
db
Merge branch 'master' into heroku_mods
more heroku fixes
mail
mail settings
Merge branch 'master' into heroku_mods

Conflicts:
	config/application.rb
updated discourse_redis
fixed the connection management thing
added redis_config back to application space
Merge branch 'master' into heroku_mods
fixing up some shit
fixed up connection mgmt
fixing up redis
Merge branch 'master' into heroku_mods
merged from master
precompile stuff
fog config
Merge branch 'master' into heroku_mods

Conflicts:
	config/initializers/mini_profiler.rb