copied models.py
Update .gitignore

Ignore Emacs and BlueFish autosave files
Delete settings.py~
Updating gitignore
Whoops.
Fixing merge conflict