Revert "Merge pull request #4 from nulogy/justinf-features"

This reverts commit d2d12f7c4b6c588233320e3626ad1cce1b5bbff9, reversing
changes made to a7c57f3d97c67b5b2b06a659ad69cc7b47cb75e1.

Conflicts:
	.gitignore
	config/deploy.rb
use production auth creds
remove angular maps causing js parse error
Merge branch 'remove_angular_maps'
update nginx config to point to qa-richard
fix png compilation error
consolidates internal tools google oauth keys
convert user controller to use devise current_user
add time to mail subject
adding pg and cleaning up gitignore
Merge branch 'master' of porcupine.local:/home/code/richard
major redesign/cleanup of how richard works
symlink database yml
symlink database yml
symlink database yml
symlink needs latest_release
cleaning up deploy and moving shared link to database.yml
trying to fix deploy
fixes bug with cancelling
fixes nginx conf