Make sure that MAP_BASELAYERS is current
No reason to make the final settings non-overridable

Move local_settings import to the end of the file.
Merge branch 'master' of https://github.com/GeoNode/geonode

Conflicts:
	geonode/settings.py