Keep pymongo out of password.py.
typo
de-lint
Fix unreachable code.

Re-factoring broke code because of pythons indentation rules, again.
What's wrong with curly brackets? Mumble mumble.