Merge branch 'master' into gh-pages

Conflicts:
	.doit.db
	conf.py
	conf.pyc
	output/assets/js/tag_cloud_data.json
	output/categories/blog.xml
	output/categories/demo.xml
	output/categories/index.html
	output/categories/nikola.xml
	output/categories/python.xml
	output/galleries/demo/index.html
	output/galleries/demo/rss.xml
	output/galleries/rss.xml
	output/index.html
	output/posts/charts.html
	output/posts/internals.html
	output/posts/welcome-to-nikola.html
	output/rss.xml
	output/sitemap.xml

	new file:   .doit.db
	new file:   cache/posts/differentology.html
	new file:   cache/posts/heart-valve-issues.html
	new file:   cache/posts/risperdal-warning.html
	new file:   cache/posts/title.html
	new file:   conf.py
	new file:   conf.pyc
	new file:   output/assets/js/tag_cloud_data.json
	new file:   output/categories/blog.xml
	new file:   output/categories/demo.xml
	new file:   output/categories/dietary-restrictions.html
	new file:   output/categories/dietary-restrictions.xml
	new file:   output/categories/evening-meal.html
	new file:   output/categories/evening-meal.xml
	new file:   output/categories/index.html
	new file:   output/categories/metaphysics.html
	new file:   output/categories/metaphysics.xml
	new file:   output/categories/music.html
	new file:   output/categories/music.xml
	new file:   output/categories/nikola.xml
	new file:   output/categories/python.xml
	new file:   output/categories/reggae.html
	new file:   output/categories/reggae.xml
	new file:   output/categories/stroke.html
	new file:   output/categories/stroke.xml
	new file:   output/categories/tags.html
	new file:   output/categories/tags.xml
	new file:   output/categories/xarelto.html
	new file:   output/categories/xarelto.xml
	new file:   output/galleries/demo/index.html
	new file:   output/galleries/demo/rss.xml
	new file:   output/galleries/rss.xml
	new file:   output/index.html
	new file:   output/posts/charts.html
	new file:   output/posts/differentology.html
	new file:   output/posts/differentology.rst
	new file:   output/posts/heart-valve-issues.html
	new file:   output/posts/heart-valve-issues.ipynb
	new file:   output/posts/internals.html
	new file:   output/posts/risperdal-warning.html
	new file:   output/posts/risperdal-warning.ipynb
	new file:   output/posts/title.html
	new file:   output/posts/title.ipynb
	new file:   output/posts/welcome-to-nikola.html
	new file:   output/rss.xml
	new file:   output/sitemap.xml
	new file:   posts/differentology.rst
	new file:   posts/heart-valve-issues.ipynb
	new file:   posts/heart-valve-issues.meta
	new file:   posts/risperdal-warning.ipynb
	new file:   posts/risperdal-warning.meta
	new file:   posts/title.ipynb
	new file:   posts/title.meta
On branch gh-pages
	deleted:    .doit.db
	deleted:    cache/posts/differentology.html
	deleted:    cache/posts/heart-valve-issues.html
	deleted:    cache/posts/risperdal-warning.html
	deleted:    cache/posts/title.html
	deleted:    conf.py
	deleted:    conf.pyc
	deleted:    output/assets/js/tag_cloud_data.json
	deleted:    output/categories/blog.xml
	deleted:    output/categories/demo.xml
	deleted:    output/categories/dietary-restrictions.html
	deleted:    output/categories/dietary-restrictions.xml
	deleted:    output/categories/evening-meal.html
	deleted:    output/categories/evening-meal.xml
	deleted:    output/categories/index.html
	deleted:    output/categories/metaphysics.html
	deleted:    output/categories/metaphysics.xml
	deleted:    output/categories/music.html
	deleted:    output/categories/music.xml
	deleted:    output/categories/nikola.xml
	deleted:    output/categories/python.xml
	deleted:    output/categories/reggae.html
	deleted:    output/categories/reggae.xml
	deleted:    output/categories/stroke.html
	deleted:    output/categories/stroke.xml
	deleted:    output/categories/tags.html
	deleted:    output/categories/tags.xml
	deleted:    output/categories/xarelto.html
	deleted:    output/categories/xarelto.xml
	deleted:    output/galleries/demo/index.html
	deleted:    output/galleries/demo/rss.xml
	deleted:    output/galleries/rss.xml
	deleted:    output/index.html
	deleted:    output/posts/charts.html
	deleted:    output/posts/differentology.html
	deleted:    output/posts/differentology.rst
	deleted:    output/posts/heart-valve-issues.html
	deleted:    output/posts/heart-valve-issues.ipynb
	deleted:    output/posts/internals.html
	deleted:    output/posts/risperdal-warning.html
	deleted:    output/posts/risperdal-warning.ipynb
	deleted:    output/posts/title.html
	deleted:    output/posts/title.ipynb
	deleted:    output/posts/welcome-to-nikola.html
	deleted:    output/rss.xml
	deleted:    output/sitemap.xml
	deleted:    posts/differentology.rst
	deleted:    posts/heart-valve-issues.ipynb
	deleted:    posts/heart-valve-issues.meta
	deleted:    posts/risperdal-warning.ipynb
	deleted:    posts/risperdal-warning.meta
	deleted:    posts/title.ipynb
	deleted:    posts/title.meta