added local_settings
removed util.py
fixed conflict in gitignore