pep8/pyflakes fixes. (@justinvdm)
Merge branch 'develop-frontend' into feature/issue-561-routing-screen-displays-an-error-message-on-a-successful-save