fixes problems with asset pipeline and vendor assets
Merge branch 'master' of github.com:phoenix-scitent/okm