updated citation form, removed unused elements
added embargo behavior to thesis cmodel as well
Merge pull request #87 from ajstanley/7.x

updated citation form, removed unused elements