Eigenstate master

I resolved the merge conflicts with `master`. I'm getting some test failures though.