pull git recursive
Merge branch 'master' of github.com:gyllstromk/dot

Conflicts:
	bootstrap.sh