Use DelimitMate again
Merge branch 'master' of github.com:jdavis/dotfiles