added username uniqueness and test
Merge branch and added email uniqueness/test for it