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

merging changes from dev to master - includes settings.py