vimrc /zshrc
Merge branch 'develop' of https://github.com/heroheman/dotfiles into develop

Conflicts:
	vimrc