Iniitial commit.
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	conf.py