personal updates
Merge branch 'master' of github.com:tmilewski/dotfiles

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