Boot2docker configuration changed
Add some more users to gitswitch file
Merge branch 'master' of github.com:elabs/dotfiles

Conflicts:
	link/gitswitch