whitespace
Remove int-set stuff; make tests pass again
transition state machine from "broken" to "clowny"
finally fix INCLUDES bug