gitignore more general
removed touch user.vim
git add alias
more general gitignore_global
Merge branch 'master' of github.com:fer/dotfiles

Conflicts:
	git/gitignore_global