If..else for environmental variables
Fixed copy+paste error...
Change environment variable name
Merge pull request #114 from petems/username_env_variable

Username env variable