Revert "Revert "Merge pull request #4 from tonuquq/two-dot-o""

This reverts commit e250d850a52b684826a7f6a46cfa2c782577be69.
fixing issues with Jukito
removing stripped down test case copy and cleaning up with some utility methods
merging in Todds changes from last night
Merge pull request #8 from tonuquq/two-dot-o

Two dot o