simplifications - issue #12
Merge branch 'stix_to_html_1_0_beta2_branch' of github.com:STIXProject/Tools into stix_to_html_1_0_beta2_branch