Colorscheme fix
Merge branch '3.0' of http://github.com/spf13/spf13-vim into 3.0
hlsearch changes
Merge branch '3.0' of https://github.com/Anden/spf13-vim into 3.0