Bootstrap Updates

Just finished wiping my personal mac clean and ran it through the bootstrap from this repo. There were quite a few things that didn't work like they did on the newer laptop that I used to write the original bootstrap script. This PR addresses those issues and makes a variety of other improvements.