fix ctrlp working_path_mode
Use elzr/vim-json instead leshill/vim-json

leshill/vim-json will NOT be updated anymore, again.
Merge pull request #365 from JoveYu/3.0

fix ctrlp working_path_mode
Merge pull request #367 from perfectworks/3.0

Use elzr/vim-json instead leshill/vim-json
skip neocomplcache configure if use snipmate
Merge pull request #376 from perfectworks/3.0

skip neocomplcache configure if use snipmate
Added vim-template plugin.
Merge remote-tracking branch 'upstream/3.0' into 3.0
vim-templates settings.
Merge branch '3.0' of http://github.com/paulhybryant/spf13-vim into 3.0

Conflicts:
	TODO.txt