Merge Fixes for Issue #60

Adding locking to all models which were not lockable before.  Will require a schemamigration.