Fixing problem with SuperTab and DelimitMate, adding puppet syntax
Merge branch 'master' of github.com:bthemad/vimfiles
Removing merginal