Simplifying loading the database settings
Merge branch 'master' into feature/server_spec
fixing resque upstart, trying to figure out unicorn failture test