conditional setting
Merge branch 'master' of https://github.com/gmarik/vimfiles
fix bindings