add option for never deleting records from db
Merge branch 'never_delete' into rails3.2