Make more idiomatic

* Some whitespace cleanup
* Some 'not x in y' to 'x not in y'
* Switch 'dict.has_key(key)' to 'key in dict'
* Change from try/except on error lookup to error.get()