added check for singular 'user' in getEntityId
Merge branch 'master' of https://github.com/usergrid/usergrid
ran grunt
Merge pull request #131 from amuramoto/master

Updated getEntityId