Refactored handshaker to not require the use of requests_oauthlib.  Also improved error handling and removed plain asserts.