Some minor changes to common.f95.in (all commented out). Defining terms that we will need when doing mixed composition agglomerates.
Deleted non source files, merged changes from hoffman branch.