Fix conflicts
remove coffeescript
Add uglifier back
12factor gem