Merge develop branch into master now that all the bootstrapping is mostly complete

Most of the bootstrapping in this project is finished so it would be appropriate to merge the develop version back into the master.