add conditional deletes, closes #68

Hi @garbados, 

Please review the following commits I made in branch 'sjkaliski-conditional-deletes'.

0fda68148cae46651ed567450c976a94e31f7335 (2014-11-24 17:42:01 -0500)
add conditional deletes, closes #68


R=@garbados