Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	.gitignore
Merge branch 'testing-2.1' of github.com:FranklinChen/franklinchen.github.com into testing-2.1