backup: April
Merge branch 'master' of https://github.com/joelotz/blog_backup

Conflicts:
	README.md
	content/2014/heatmap.md
	content/notebooks/heatmap.ipynb
	output
	theme/notebook-simpler/static/css/simply.css
	theme/notebook-simpler/static/images/favicon.ico
	theme/notebook-simpler/static/images/robot.png
	theme/notebook-simpler/templates/base.html
	theme/simply/templates/base.html