thesis modifications that were never made - may need to revert
Merge branch 'master' of github.com:keflavich/thesis