rest of cleanup

`flake8 --ignore=E501,E128 --exclude=migrations,config server/`
That is the command I used to check for odd things, found some mixed tabs and other things that are potentially bug inducing