updated __init__.py diff
Merge branch 'master' of https://github.com/opencivicdata/docs.opencivicdata.org
changes to conf so the RTD theme shows up
Merge branch 'master' of https://github.com/opencivicdata/docs.opencivicdata.org

Conflicts:
	conf.py
moving some docs around