fixed bulk_delete
Merge branch 'master' of https://github.com/kpurdon/OPS
Merge branch 'master' into OPS2-AUTH

Conflicts:
	conf/django/ops/ops/views.py