Clean up, Working version, added department information and term infomration
Merge pull request #5 from mcharris/master

Clean up, Working version, added department information and term infomra...