Updates from office.
Merge branch 'master' of github.com:notmii/.files

Conflicts:
	util-functions.vim
	vimrc
Removed YouCompleteMe vim plugin.
Added eclim plugin.
Untracked selecta folder.
Removed some vim plugins.
Ewan