Version 3.
Merge branch 'master' of https://github.com/takitapart/dotfiles

Conflicts:
	bootstrap.sh