Merge remote-tracking branch 'octopress/master' into source

Conflicts:
	_config.yml
Add feedburner