Reworked delete code
Merge branch 'master' of https://github.com/citizensense/pasture

Conflicts:
	model.py
Minor bug fix