This is looking great. My system has diverged enough that I probably won't be able to implement a lot of it without some re-working, but if you're looking at Jekyll, be sure to try out [Octopress 3](https://github.com/octopress/octopress) in the exploration process.