Refactor and modularise bootstrap
Merge branch 'master' of github.com:davidjb/dotfiles