Heroku enable (using unicorn and postgres)
Fully switch to postgres
Merge pull request #12 from curious-attempt-bunny/merlyn/heroku

Deploy to heroku
Merge branch 'master' into jhyland/outcomes/pricing

Conflicts:
	Gemfile.lock
	db/schema.rb