Updated neocompl
Added gitignore
Merge branch 'master' of github.com:MaxKolodziej/dotfiles

Conflicts:
	vim/settings.vim
	vim/vundle.vim