refactored a bit of the service_broker code, deactivate/delete
plans/services depending on situation
Added test for marking service inactive with active plan

Signed-off-by: Zach Robinson <zrobinson@pivotallabs.com>
Merge branch 'catalog_sync_wip'