Add config to enable neocom on startup
Merge branch 'master' of https://github.com/syguer/dotfiles

Conflicts:
	.vimrc