showing proper error when user tries to register with an email already registered
don't hide activation error from user
removing remote URLs from css we include on local server
added ASCII art logo
Merge pull request #58 from bcipolli/regerr_actual

Fail nicely in user registration / login on central server
Merge pull request #74 from bcipolli/local_css_urls

Use local URLs for resources in khan-site.css
Merge pull request #75 from mrshu/asciiart_logo

added ASCII art logo
remove migrations from list of unstaged files.
Merge branch 'no_more_migrations' into install_ux

Conflicts:
	kalite/registration/views.py
	kalite/templates/registration/registration_form.html
migrate from local_or_ to getattr
oops, TEMPLATE_DEBUG should default to DEBUG, not 'DEBUG'
Merge pull request #61 from bcipolli/urls

Abstracting urls/emails/securesync protocol
Merge remote-tracking branch 'upstream/develop' into auto_create_zone

Conflicts:
	kalite/registration/views.py
	kalite/templates/registration/registration_form.html
Merge remote-tracking branch 'origin/auto_create_zone' into contact_ux

Conflicts:
	kalite/registration/views.py
	kalite/settings.py
	kalite/templates/central/landing_page.html
small ui changes
not sure
Merge remote-tracking branch 'origin/contact_ux' into install_ux

Conflicts:
	kalite/registration/views.py
Merge branch 'install_ux' of github.com:bcipolli/ka-lite into install_ux

Conflicts:
	.gitignore