adding changes from darkroom
Merge branch 'master' of github.com:phutchins/octopress

Conflicts:
	source/about/index.markdown
	source/vim-cheatsheet/index.markdown