Fix static files in the settings. They had been removed for some reason.
Add some python3 items to the git ignore.
Minor note.
Merge branch 'master' into Windows-staging