more mods
Merge branch 'master' of https://github.com/chrisbernal/dotfiles

Conflicts:
	brew.sh