Updated gitignore to remove IDEA dir, made settings.py machine independent
Fixed merge conflict in gitignore