Added vagrant to path
Merge branch 'master' of github.com:joshuaspence/dotfiles

Conflicts:
	home/bashrc