Merge branch '3.0' of github.com:diogro/spf13-vim into 3.0
spell  stuff
Merge branch '3.0' into local
Merge branch 'local' of github.com:diogro/spf13-vim into local