Octopress standard
Merge branch 'source'

Conflicts:
	_config.yml