More alias
Pull strategy
Weird mappings
Costum snips
Merge branch 'master' of github.com:nulpunkt/configs

Conflicts:
	vimrc