Update documentation
Update documentation
Update documentation
Update documentation
Update documentation
Update documentation
Merge branch 'gh-pages'

Conflicts:
	content/articles/tutorials/2014-03-31-testing-ipython-integration.mdown
	content/articles/tutorials/python_tutorial.md
	content/notebooks/.ipynb_checkpoints/demonstration-checkpoint.ipynb
	content/notebooks/demonstration.ipynb
	pelicanconf.py
	requirements.txt