Clean database.yml
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Merge branch 'master' into deploy
Assets
Autogenerated Change: disregard
http://stackoverflow.com/questions/10170807/activerecordstatementinvalid-pg-error
Comment out removed features of the latest Redis builds.
Use PG instead of Sqlite and Update the gemfile for HTTPS/Ruby2.
Localhost dev env.
[TODO] Reinstate these lines once I am aware why they were an issue!
RVMRC not rbenv, ruby 2.
Use localhost bennett pg user.
Fixed my idiocy.

Fix my idiocy.

Merge branch 'refs/heads/deploy'

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/ci_mailer/build_result.html.haml
	db/schema.rb