Fixes for delete_snapshot and PEP8 compatibility
Fixes for delete_snapshot and PEP8 compatibility

sjones4/eutester,nephomaniac/eutester,nephomaniac/eutester,tbeckham/eutester,shaon/eutester,nagyistoce/eutester,shaon/eutester,sjones4/eutester,shaon/eutester,tbeckham/eutester,nephomaniac/nephoria,tbeckham/eutester,nephomaniac/eutester,shaon/eutester,sjones4/eutester,nagyistoce/eutester,nephomaniac/nephoria,nagyistoce/eutester,nagyistoce/eutester,sjones4/eutester,tbeckham/eutester