About to merge Octopress 2.1
Incorporating tag generator.