JAVA-7: Better re-auth and authentication
Merge pull request #5 from bronto/JAVA-7

JAVA-7: Better re-auth and authentication