Fix a bug in our metadata test
Fix None conditionals to make PEP8 happy
Apply a patch from brouhaha to have the client look for a FAS_USERNAME env var (#729)