Added assertions to incremental state test.
Switch to fluent style use of QueryBuilder.
Fluent (!gangnum) style for the mappers.
Merge pull request #4 from boneill42/master

Cleanup, with working incremental state.