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

Conflicts:
	Gemfile
	Gemfile.lock
	_config.yml
Merge branch 'source' of github.com:TonnyXu/octopress into source

Conflicts:
	Gemfile
	Gemfile.lock
	_config.yml