Asset pipeline issues
Merge pull request #317 from rickcarlino/master

Last hotfix, honest.