Userstamp tidy up, last fixes for tests failures.

Removed last remnants of userstamp gem in migrations.
changed filter to use implicit 'and'.
fixed last failing tests