merged settings
rearranging things
got django page up to under construction page