add some stuff
Merge branch 'master' of https://github.com/calmyournerves/dotfiles

Conflicts:
	Brewfile