Asset bugfixes

Consolidate assets into single directory
Fix asset pipeline on Heroku (production env)