Merge pull request #1 from jordandukart/7.x

Add additional content model functionality for UMKC.
Update based on bugs Dan found.