break apart some methods to make code less complex
Merge branch 'master' of github.com:middleman/middleman
fix builder not cleaning empty directories