Vim: Set matchparen timeout, improve python syntax
Merge branch 'master' of ssh://github.com/Belgarion/dotfiles