adding code to detect my IP
making 'contribute' contacts actually work (oops\!)
some UI layout touches
Merge remote-tracking branch 'origin/syncing_models' into syncing_errors_bug

Conflicts:
	kalite/settings.py
Propagating syncing errors, reporting errors and exceptions to user
propagate server error information to client
updated documentation.  made central_server_host refer to the actual HTTP_HOST, and only expose it through main/custom_context_processors.py.  Make back-end email run through local_or_ code
updated documentation.  made central_server_host refer to the actual HTTP_HOST, and only expose it through main/custom_context_processors.py.  Make back-end email run through local_or_ code
Merge branch 'urls' of github.com:bcipolli/ka-lite into urls

Conflicts:
	docs/TESTBED.md
adding pytz module (dependency)
Merge remote-tracking branch 'origin/pytz' into develop
Merge branch 'urls' into develop

Conflicts:
	docs/TESTBED.md
	kalite/templates/central/landing_page.html
Merge branch 'syncing_models' into develop

Conflicts:
	kalite/securesync/api_client.py
	kalite/securesync/management/commands/syncmodels.py
Merge branch 'self_register' into develop

Conflicts:
	kalite/securesync/urls.py
Merge branch 'install_ux' into develop