no more sudo for docker
stuff
Merge branch 'master' of github.com:paulbdavis/dotfiles

Conflicts:
	.vim
	bin/dockr