Vim changes???
Merge branch 'master' of github.com:hmaarrfk/bash-tools
Merge branch 'master' of github.com:hmaarrfk/bash-tools
Merge branch 'master' of github.com:hmaarrfk/bash-tools
Added a su function
Merge branch 'master' of github.com:hmaarrfk/bash-tools

Conflicts:
	vim/bundle/jedi-vim