fixing some asset pipeline stuff
Merge branch 'master' of github.com:carolinemarcks/blockytalky-ror