boot2docker
Merge branch 'master' of github.com:brendanjerwin/dotfiles

Conflicts:
	.zshrc