new stuff
Merge branch 'master' of https://github.com/sebastianmoreno/vim.files

Conflicts:
	vimrc
delete submodules