Merge pull request #1 from inmakn/develop

Wednesday Morning Push (Sean)
Merge pull request #2 from inmakn/develop

Develop
added 12factor gem for deploy
added 12factor gem for deploy