update more files to non-hashrocket syntax
unvendor fastimage
Merge branch 'master' of github.com:middleman/middleman