need to update
Merge branch 'master' of github.com:hmaarrfk/bash-tools

Conflicts:
	git/cvsignore
added vim package