Added some options
Merge branch 'master' of github.com:dxtr/dotfiles

Conflicts:
	zshrc