Merge and squash of code for Kuali version.
Merge pull request #1 from aheward/test

Merge and squash of code for Kuali version.