userName -> user
Merge pull request #60 from lukecampbell/naming

userName -> user