Remove commented out code that is no longer relevant.
Modify features around UserSuppliedIds #71.
Merge remote-tracking branch 'origin/master'
Make usersuppliedid marked tests be id type independent #71