Refactor Bootstrap to be less procedural
Merge branch 'master' of github.com:theron17/dotfiles