12 Factor
Merge pull request #22 from databasically/09-05-2013

12 Factor