Merge pull request #1 from enzy/master

grab upstream changes
DO api now uses error_message to describe errors
Merge pull request #3 from ericvicenti/master

Update to error handling