added settings to handle whitespace
added vagrant to PATH
Merge branch 'master' of https://github.com/carlosduque/dotfiles

Conflicts:
	zshrc