Autocomplete
Merged
Merged
Merge branch 'master' of https://github.com/tomphp/vimrc

Conflicts:
	.vimrc