New blog, working copy.
Merge branch 'master' of https://github.com/Diti/DotMe

Conflicts:
	Rakefile
	_config.yml
	source/_includes/custom/navigation.html
	source/index.html