Merge branch 'master' of git://github.com/imathis/octopress into source

Conflicts:
	Rakefile