Removed duplicate empty displayName logic block

The code was checking for an emptyDisplay name before trying to set the displayName based on the friendly name. It was also swapping the firstName and lastName.
    
This changes removes that code block and fixes the logic in the code.
Merge pull request #156 from jhubert/patch-1

Removed duplicate empty displayName logic block