Issue #240

This is ready to merge.  However, you may want to look at the default foreignkey value of 4, which is 'uM', line 459 of models.py.  Is there a more reliable way to do this?