jdolitsky Merge pull request #163 from zachpuck/token-auth …