add ova cleanup task
fix typo
fix some typos and make sure file deletion doesn't fail
Merge branch 'ova_cleanup' into vmware-2.1

Conflicts:
	config/deploy/production.rb