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