Some new stuff
Merge branch 'master' of github.com:vicpenap/zsh_dotfiles

Conflicts:
	zshrc