zshrc changes
vimrc changes
Merge branch 'master' of git://github.com/dickfickling/dotfiles_arch

Conflicts:
	zshrc