added some new features to zsh bash and vimrc
Merge branch 'master' of github.com:Timbinous/dotfiles

Conflicts:
	.bashrc