Adding local settings file to gitignore
Merge conflict
Fix uploading to use file, not filename. Update tests