added 12factor gem
Merge branch 'release/20140426-1710'