fix one bug in vimrc: Multiple_cursors can not work when not using neocomplete or neocomplcache
Merge branch 'upstream'