Improve tagging
Update Gemfile
Add 12 factor gem