fixed some previous rebase issues, all tests pass. @scopatz, we should be good to go.