fixes issue #48
fixed tests
fixed username/email ambiguity
added tests and removed console.log
Merge pull request #57 from jembi/timestamp

fixes issue #48