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

Conflicts:
	Gemfile.lock
	_config.yml