Rebase to latest middleman tag and fixup dependencies

I struggled to get this running (and all tests passing) after rebasing this off the latest stable without these tweaks. I also added a default rake task.