ericsson: updated
disable flake mappings
vim: remove omni cpp
vim: remove nerdtree

Conflicts:
	.vimrc
vim: bundle syslog-ng
vim: bundle fugitive
vim: remove omni references