minor changes
Merge branch 'master' of https://github.com/amiorin/dotfiles

Conflicts:
	vimrc
	zshrc
wip