added ASCII art logo
Merge pull request #75 from mrshu/asciiart_logo

added ASCII art logo
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 api_url

Conflicts:
	kalite/settings.py