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

Conflicts:
	README.markdown
	Rakefile
	_config.yml
Merging upstream down into our repo for new hotness