Use dict.get() consistently and clean up minor spacing issues.
Merge pull request #82 from iandanforth/patch-3

Use dict.get() consistently and clean up minor spacing issues.