Adjusts the gitignore

Gitignore file was not catching the requirements file. Also fixes
conflict in settings-common.py