...laptop changes... probably need to be reverted since they're not
really changes
Merge branch 'master' of github.com:keflavich/thesis