Merge pull request #201 from andymcc/sprint

Merged automatically by jenkins after successful gate test
Merge pull request #202 from andymcc/sprint

Merged automatically by jenkins after successful gate test
[DEFECT]: evacuate_hosts will use itself as a migration target

Fixes #203
Merge pull request #204 from rackerjoe/sprint

Merged automatically by jenkins after successful gate test