[BUGFIX] Fix username madness

Also, you can't put @ in the source or destination so remove instances
of this from the test data.
Merge pull request #60 from chewi/bugfix/usernames

[BUGFIX] Fix username madness