Init customizations
Merge branch 'master' of https://github.com/simon-johansson/dotfiles-1

* 'master' of https://github.com/simon-johansson/dotfiles-1:
  Init customizations

Conflicts:
	Brewfile
	bootstrap.sh