merge more into core, use gem availability to autoload
Merge pull request #891 from middleman/magic_more

Merge more into core, use gem availability to autoload support