Fix some Landscape.io errors and warnings
Merge remote-tracking branch 'upstream/master' into landscape-fixes
Don't use builtin as variable
Merge pull request #984 from hugovk/landscape-fixes

Fixed duplicate imports, naming variables after builtins