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
 On branch gh-pages
   new file:   .doit.db
	new file:   README.txt
	new file:   cache/galleries/demo/index.html
	new file:   cache/less/blog-mixins.less
	new file:   cache/less/blog.less
	new file:   cache/less/code.less
	new file:   cache/less/font-awesome-3.2.1/bootstrap.less
	new file:   cache/less/font-awesome-3.2.1/core.less
	new file:   cache/less/font-awesome-3.2.1/extras.less
	new file:   cache/less/font-awesome-3.2.1/font-awesome-ie7.less
	new file:   cache/less/font-awesome-3.2.1/font-awesome.less
	new file:   cache/less/font-awesome-3.2.1/icons.less
	new file:   cache/less/font-awesome-3.2.1/mixins.less
	new file:   cache/less/font-awesome-3.2.1/path.less
	new file:   cache/less/font-awesome-3.2.1/variables.less
	new file:   cache/less/layout.less
	new file:   cache/less/lists.less
	new file:   cache/less/main.less
	new file:   cache/less/mixins.less
	new file:   cache/less/pager.less
	new file:   cache/less/pagination.less
	new file:   cache/less/prettify.less
	new file:   cache/less/reset.less
	new file:   cache/less/targets
	new file:   cache/less/thumbnails.less
	new file:   cache/less/type.less
	new file:   cache/less/variables.less
	new file:   cache/posts/1.html
	new file:   cache/posts/charts.html
	new file:   cache/posts/differentology.html
	new file:   cache/posts/heart-valve-issues.html
	new file:   cache/posts/plugin-architecture.html
	new file:   cache/posts/risperdal-warning.html
	new file:   cache/posts/slides-demo.html
	new file:   cache/posts/title.html
	new file:   cache/stories/1.html
	new file:   cache/stories/a-study-in-scarlet.html
	new file:   cache/stories/bootstrap-demo.html
	new file:   cache/stories/charts.html
	new file:   cache/stories/creating-a-theme.html
	new file:   cache/stories/extending.html
	new file:   cache/stories/internals.html
	new file:   cache/stories/listings-demo.html
	new file:   cache/stories/listings-demo.html.dep
	new file:   cache/stories/manual.html
	new file:   cache/stories/quickref.html
	new file:   cache/stories/quickstart.html
	new file:   cache/stories/slides-demo.html
	new file:   cache/stories/social_buttons.html
	new file:   cache/stories/theming.html
	new file:   cache/stories/upgrading-to-v6.html
	new file:   cache/webassets/799bd7f1c8bd2cf07002552cb5effdf6
	new file:   cache/webassets/7e9a6b30623f4d00c99219ed023353ff
	new file:   cache/webassets/9ce5194d04001dce135b5f1f7c180ff5
	new file:   cache/webassets/a18672ab1fe3a9324ef4042d11c66e49
	new file:   cache/webassets/c6b8d315cece3cdc38433e696f1fa346
	new file:   cache/webassets/e0eff05b97d559892f354554aef2b9f1
	new file:   conf.py
	new file:   conf.pyc
	new file:   files/assets/css/custom.css
	new file:   files/favicon.ico
	new file:   files/images/biohazard.png
	new file:   galleries/demo/exclude.meta
	new file:   galleries/demo/index.txt
	new file:   galleries/demo/tesla2_lg.jpg
	new file:   galleries/demo/tesla4_lg.jpg
	new file:   galleries/demo/tesla_conducts_lg.jpg
	new file:   galleries/demo/tesla_lightning1_lg.jpg
	new file:   galleries/demo/tesla_lightning2_lg.jpg
	new file:   galleries/demo/tesla_tower1_lg.jpg
	new file:   listings/hello.py
	new file:   listings/hello.pyc
	new file:   output/2012/index.html
	new file:   output/2013/index.html
	new file:   output/archive.html
	new file:   output/assets/css/all-nocdn.css
	new file:   output/assets/css/all.css
	new file:   output/assets/css/bitter.css
	new file:   output/assets/css/code.css
	new file:   output/assets/css/custom.css
	new file:   output/assets/css/ipython.min.css
	new file:   output/assets/css/main.css
	new file:   output/assets/css/nikola_ipython.css
	new file:   output/assets/css/rst.css
	new file:   output/assets/css/theme.css
	new file:   output/assets/fonts/FontAwesome.otf
	new file:   output/assets/fonts/SHIcXhdd5RknatSgOzyEkA.woff
	new file:   output/assets/fonts/eMS0tViDqryBl0EG1pqFZfesZW2xOQ-xsNqO47m55DA.woff
	new file:   output/assets/fonts/evC1haE-MsorTl_A7_uSGT8E0i7KZn-EPnyo3HZu7kw.woff
	new file:   output/assets/fonts/fontawesome-webfont.eot
	new file:   output/assets/fonts/fontawesome-webfont.svg
	new file:   output/assets/fonts/fontawesome-webfont.ttf
	new file:   output/assets/fonts/fontawesome-webfont.woff
	new file:   output/assets/images/blue-mocha-grunge.jpg
	new file:   output/assets/images/cream-dust.png
	new file:   output/assets/images/glyphicons-halflings-white.png
	new file:   output/assets/images/glyphicons-halflings.png
	new file:   output/assets/js/all-nocdn.js
	new file:   output/assets/js/all.js
	new file:   output/assets/js/jquery-1.10.2.min.js
	new file:   output/assets/js/jquery.timeago.js
	new file:   output/assets/js/mathjax-onload.js
	new file:   output/assets/js/mathjax.js
	new file:   output/assets/js/tag_cloud_data.json
	new file:   output/categories/blog.html
	new file:   output/categories/blog.xml
	new file:   output/categories/demo.html
	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.html
	new file:   output/categories/nikola.xml
	new file:   output/categories/python.html
	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/favicon.ico
	new file:   output/galleries/demo/index.html
	new file:   output/galleries/demo/rss.xml
	new file:   output/galleries/demo/tesla4_lg.jpg
	new file:   output/galleries/demo/tesla4_lg.thumbnail.jpg
	new file:   output/galleries/demo/tesla_conducts_lg.jpg
	new file:   output/galleries/demo/tesla_conducts_lg.thumbnail.jpg
	new file:   output/galleries/demo/tesla_lightning1_lg.jpg
	new file:   output/galleries/demo/tesla_lightning1_lg.thumbnail.jpg
	new file:   output/galleries/demo/tesla_lightning2_lg.jpg
	new file:   output/galleries/demo/tesla_lightning2_lg.thumbnail.jpg
	new file:   output/galleries/demo/tesla_tower1_lg.jpg
	new file:   output/galleries/demo/tesla_tower1_lg.thumbnail.jpg
	new file:   output/galleries/index.html
	new file:   output/galleries/rss.xml
	new file:   output/images/biohazard.png
	new file:   output/index.html
	new file:   output/listings/hello.py.html
	new file:   output/listings/index.html
	new file:   output/posts/charts.html
	new file:   output/posts/charts.txt
	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/internals.rst
	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/posts/welcome-to-nikola.rst
	new file:   output/rss.xml
	new file:   output/sitemap.xml
	new file:   output/stories/a-study-in-scarlet.html
	new file:   output/stories/a-study-in-scarlet.txt
	new file:   output/stories/about-nikola.html
	new file:   output/stories/about-nikola.rst
	new file:   output/stories/bootstrap-demo.html
	new file:   output/stories/bootstrap-demo.rst
	new file:   output/stories/creating-a-theme.html
	new file:   output/stories/creating-a-theme.rst
	new file:   output/stories/extending.html
	new file:   output/stories/extending.txt
	new file:   output/stories/handbook.html
	new file:   output/stories/handbook.rst
	new file:   output/stories/internals.html
	new file:   output/stories/internals.txt
	new file:   output/stories/listings-demo.html
	new file:   output/stories/listings-demo.rst
	new file:   output/stories/quickref.html
	new file:   output/stories/quickref.rst
	new file:   output/stories/quickstart.html
	new file:   output/stories/quickstart.rst
	new file:   output/stories/social_buttons.html
	new file:   output/stories/social_buttons.txt
	new file:   output/stories/theming.html
	new file:   output/stories/theming.rst
	new file:   output/stories/upgrading-to-v6.html
	new file:   output/stories/upgrading-to-v6.txt
	new file:   posts/1.rst
	new file:   posts/charts.txt
	new file:   posts/differentology.rst
	new file:   posts/heart-valve-issues.ipynb
	new file:   posts/heart-valve-issues.meta
	new file:   posts/plugin-architecture.md
	new file:   posts/plugin-architecture.rst
	new file:   posts/risperdal-warning.ipynb
	new file:   posts/risperdal-warning.meta
	new file:   posts/title.ipynb
	new file:   posts/title.meta
	new file:   stories/1.rst
	new file:   stories/a-study-in-scarlet.txt
	new file:   stories/bootstrap-demo.rst
	new file:   stories/creating-a-theme.rst
	new file:   stories/extending.txt
	new file:   stories/internals.txt
	new file:   stories/listings-demo.rst
	new file:   stories/manual.rst
	new file:   stories/quickref.rst
	new file:   stories/quickstart.rst
	new file:   stories/social_buttons.txt
	new file:   stories/theming.rst
	new file:   stories/upgrading-to-v6.txt
	new file:   themes/base-jinja/AUTHORS.txt
	new file:   themes/base-jinja/README.md
	new file:   themes/base-jinja/engine
	new file:   themes/base-jinja/parent
	new file:   themes/base-jinja/templates/annotation_helper.tmpl
	new file:   themes/base-jinja/templates/base.tmpl
	new file:   themes/base-jinja/templates/base_helper.tmpl
	new file:   themes/base-jinja/templates/comments_helper.tmpl
	new file:   themes/base-jinja/templates/crumbs.tmpl
	new file:   themes/base-jinja/templates/disqus_helper.tmpl
	new file:   themes/base-jinja/templates/facebook_helper.tmpl
	new file:   themes/base-jinja/templates/gallery.tmpl
	new file:   themes/base-jinja/templates/googleplus_helper.tmpl
	new file:   themes/base-jinja/templates/index.tmpl
	new file:   themes/base-jinja/templates/index_helper.tmpl
	new file:   themes/base-jinja/templates/intensedebate_helper.tmpl
	new file:   themes/base-jinja/templates/list.tmpl
	new file:   themes/base-jinja/templates/list_post.tmpl
	new file:   themes/base-jinja/templates/listing.tmpl
	new file:   themes/base-jinja/templates/livefyre_helper.tmpl
	new file:   themes/base-jinja/templates/moot_helper.tmpl
	new file:   themes/base-jinja/templates/mustache-comment-form.tmpl
	new file:   themes/base-jinja/templates/post.tmpl
	new file:   themes/base-jinja/templates/post_helper.tmpl
	new file:   themes/base-jinja/templates/post_list_directive.tmpl
	new file:   themes/base-jinja/templates/slides.tmpl
	new file:   themes/base-jinja/templates/story.tmpl
	new file:   themes/base-jinja/templates/tag.tmpl
	new file:   themes/base-jinja/templates/tagindex.tmpl
	new file:   themes/base-jinja/templates/tags.tmpl
	new file:   themes/zen-ipython/AUTHORS.txt
	new file:   themes/zen-ipython/README.md
	new file:   themes/zen-ipython/assets/css/bitter.css
	new file:   themes/zen-ipython/assets/css/ipython.min.css
	new file:   themes/zen-ipython/assets/css/nikola_ipython.css
	new file:   themes/zen-ipython/assets/fonts/FontAwesome.otf
	new file:   themes/zen-ipython/assets/fonts/SHIcXhdd5RknatSgOzyEkA.woff
	new file:   themes/zen-ipython/assets/fonts/eMS0tViDqryBl0EG1pqFZfesZW2xOQ-xsNqO47m55DA.woff
	new file:   themes/zen-ipython/assets/fonts/evC1haE-MsorTl_A7_uSGT8E0i7KZn-EPnyo3HZu7kw.woff
	new file:   themes/zen-ipython/assets/fonts/fontawesome-webfont.eot
	new file:   themes/zen-ipython/assets/fonts/fontawesome-webfont.svg
	new file:   themes/zen-ipython/assets/fonts/fontawesome-webfont.ttf
	new file:   themes/zen-ipython/assets/fonts/fontawesome-webfont.woff
	new file:   themes/zen-ipython/assets/images/blue-mocha-grunge.jpg
	new file:   themes/zen-ipython/assets/images/cream-dust.png
	new file:   themes/zen-ipython/assets/images/glyphicons-halflings-white.png
	new file:   themes/zen-ipython/assets/images/glyphicons-halflings.png
	new file:   themes/zen-ipython/assets/js/jquery-1.10.2.min.js
	new file:   themes/zen-ipython/assets/js/jquery.timeago.js
	new file:   themes/zen-ipython/assets/js/mathjax-onload.js
	new file:   themes/zen-ipython/bundles
	new file:   themes/zen-ipython/conf.py.sample
	new file:   themes/zen-ipython/engine
	new file:   themes/zen-ipython/less/blog-mixins.less
	new file:   themes/zen-ipython/less/blog.less
	new file:   themes/zen-ipython/less/code.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/bootstrap.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/core.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/extras.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/font-awesome-ie7.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/font-awesome.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/icons.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/mixins.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/path.less
	new file:   themes/zen-ipython/less/font-awesome-3.2.1/variables.less
	new file:   themes/zen-ipython/less/layout.less
	new file:   themes/zen-ipython/less/lists.less
	new file:   themes/zen-ipython/less/main.less
	new file:   themes/zen-ipython/less/mixins.less
	new file:   themes/zen-ipython/less/pager.less
	new file:   themes/zen-ipython/less/pagination.less
	new file:   themes/zen-ipython/less/prettify.less
	new file:   themes/zen-ipython/less/reset.less
	new file:   themes/zen-ipython/less/targets
	new file:   themes/zen-ipython/less/thumbnails.less
	new file:   themes/zen-ipython/less/type.less
	new file:   themes/zen-ipython/less/variables.less
	new file:   themes/zen-ipython/parent
	new file:   themes/zen-ipython/templates/arusahni_helper.tmpl
	new file:   themes/zen-ipython/templates/base.tmpl
	new file:   themes/zen-ipython/templates/index.tmpl
	new file:   themes/zen-ipython/template/post.tmpl