Updates!
Merge branch 'master' of github.com:jroes/dotfiles

Conflicts:
	vim/vimrc.symlink
	zsh/zshrc.symlink