Upgraded to Middleman 3.
Merge branch 'upgrade-to-mm-3'
Got middleman server to run with cleaner config.
Messed up a lot of stuff.
Moved some files around.
Merge branch 'task-cleanup'