Update dotfiles
Merge branch 'master' of github.com:/loopj/dotfiles

Conflicts:
	.vimrc
	.zshrc