removing heroku db line from dev
merge=ours for settings.py
changed names of some tests
ignoring settings.py from now on
ignoring settings.py