Better check of images dir. Fixes middleman/middleman#1300
merge
wip sprockets refactor