Merge branch 'master' of git://github.com/edgurgel/vim-files

Conflicts:
	plugin/neocomplcache.vim