adding settings.py to checkin and removing from gitignore
Merge branch 'dev' of https://github.com/OPEC-PML/GISportal into dev