Username conflicts might work now.
Merge pull request #13 from tinfoilboy/master

Username conflicts might work now.