METplus-2.0

Merge remote-tracking branch 'origin/develop'

Merging all changes from the develop branch to master branch in
preparation for the METplus-2.0 Release which will be cut from
the master branch.

This commit has been run through and passed all working functional
use case tests.

METplus-1.0

Merge remote-tracking branch 'origin/develop'

Merging all changes from the develop branch to master branch in
preparation for the METplus Gamma Release which will  be cut from
the master branch.

This commit has been run through and passed all working unit and integration
tests.