thesis updates from eta
Merge branch 'master' of github.com:keflavich/thesis