fix for #35
Merge pull request #36 from rackerlabs/fix_delete_server_issue

fix for #35
Merge remote-tracking branch 'origin/master' into plugin