Made organization an optional setting defaulting to none being set.
Made contentType an optional setting defaulting to "text/html"
Merge branch 'moreCleanup' into develop