Import source code
We need action_controller, action_view, sprockets, that's it.
Merge remote-tracking branch 'heroku/master'

Conflicts:
	config/application.rb
Revert "We need action_controller, action_view, sprockets, that's it."

This reverts commit 06d6c49f4a7dbd46bda8d14bc3fa4f454044e399.
Add pg to run on a heroku dyno