nuke and pave
Merge branch 'master' of https://github.com/wem3/dotfiles

Conflicts:
	.osx
	Brewfile_python
	Caskfile
	bootstrap.sh