using asset pipeline for images
Merge branch 'master' into inwoods