eta thesis changes; will need merge
Merge branch 'master' of github.com:keflavich/thesis

Conflicts:
	ch_boundhii.tex