pylint: Only disable bad-builtin
vim: Set 2-space tab filetypes in a loop, adding html/css
Merge remote-tracking branch 'origin/master' into mac