Merge pull request #56 from jasonalmaturner/master

still hacking away at the authentication