source bashrc after cloning dotfiles
Merge branch 'master' of https://github.com/vdloo/vagrantfiles

Conflicts:
	editor/retrieve.sh
merged conflict