update bootstrap
Merge branch 'master' of https://github.com/locojay/dotfiles

Conflicts:
	gitignore