Cleanup and refactor digitalocean integration

* Handle case where droplet is locked pending events, DO support says
they are planning to expose something in the api to show these events.
Until then this is the best we have.
* Whitespace cleanup
* Refactor test helpers
* Use the collection helper for the digitalocean servers collection
Whitespace
Whitespace, fix tests for running in non mock mode, and clean up in non mock mode
digitalocean supports bootstrap
Fix digitalocean server test
Add digitalocean mock key to run these tests on travis
Add ip_address to the mock
Remove mock server from servers list on destroy
Add ip_address method back, but deprecate it.
Merge pull request #1971 from trobrock/better-digitalocean

Better digitalocean support
[AWS|ASG] filtering for ASG Scaling Activities
Fix #server so that it returns the right server instead of all servers
Merge pull request #1998 from bgentry/filter-asg-activities

[AWS|ASG] filtering for ASG Scaling Activities
Merge pull request #1999 from sbergmann/master

Fix #server so that it returns the right server instead of all servers
[xenserver] Console model created
[xenserver] Consoles collection created
Merge pull request #2000 from zertico/xenserver_console_model

[xenserver] Console model created
[AWS|ASG] parse ScalingPolicy MinAdjustmentStep

For some reason this attribute was missing from the parser. Proof that
it exists:

http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_ScalingPolicy.html
Merge pull request #2001 from bgentry/asg-policy-min-adjustment

[AWS|ASG] parse ScalingPolicy MinAdjustmentStep