Merge middleman-more back into middleman-core
Merge pull request #1193 from bhollis/middleman-more

Merge middleman-more back into middleman-core