Configured asset pipeline
Resolved conflict bringing master in
Merge branch 'master' of https://github.com/thadley/bloccitoff