Updating
Merge branch 'master' of github.com:hmaarrfk/bash-tools

Conflicts:
	vim/bundle/sbell/after/syntax/tex.vim