Fix conflicts
remove coffeescript
Add uglifier back
12factor gem
Merge pull request #5 from bscofield/master

Fix asset pipeline