Reorganize bootstrap script

This should be a little less ambitious and opinionated -- for example, I'll leave installing ruby outside of the scope of this bootstrap script

* [x] update master with the latest configuration files from the various computers I use
* [ ] update this branch to use those configuration files
* [ ] make sure it runs cleanly and simply on linux and mac