shortening use of localsettings into function, applying to all options to allow easier debugging/config
fixing bug in using template value, replacing url from merge, initial version of localor to allow easier testing
Merge remote-tracking branch 'origin/localor' into urls

Conflicts:
	kalite/settings.py