Changed Selection Method for username
Fixed Indent Styles
Remove Underscore swapping in usernames
Merge pull request #2 from mglinski/develop

Changed Selection Method for username, Fixed Indent Styles