Merge pull request #61 from KyleW/auth

Code clean up and replacing environmental variables with local ones
Merge branch 'master' into auth