Do api2

This has two commits.  The first of them includes changes that we can't use yet but will need as soon as Salt's adoption of Digital Ocean's v2.0 API makes it to a release we otherwise require.  The second one reverts these changes, leaving the ones in the local scripts, and adding final fixes.