vim alias
update pentadactlyrc
zsh as default tmux command
update vundle and use vim solarized
source z.sh in zshrc
add vim polyglot
gitconfig
Merge branch 'master' of github.com:stuarthicks/etc

Conflicts:
	aliases
	pentadactylrc
	vimrc