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

Conflicts:
	Gemfile
	Gemfile.lock
	_config.yml

Aggiornamento octopress
Correzione vari snippets