New plugins: snipmate and ctrl-p
Merge branch 'master' of github.com:pschmitt/vim