Add rails_12factor gem, to support heroku deploys
Merge pull request #76 from justinsb/heroku

Add rails_12factor gem, to support heroku deploys
Update README.md
Merge pull request #1 from lockitron/master

Merge updates