Normalise whitespace to PEP8
Avoid reusing using built-in function names
Remove duplicate dict key
Merge pull request #12 from pysquared/master

A few tidy ups :-)