Merge pull request #96 from asfadmin/devel

Pull latest changes
Some smaller changes in the metadata generation.
Merge pull request #311 from rudigens/rgps

Some changes in the metadata generation.