add neocomplete
Merge branch 'master' of github.com:lowki93/dotvim

Conflicts:
	vimrc