Fix add_metadata.py when existing metadata

Fixes #120
This bug occured for both samples and observations.
Tests have been altered to test for case when extra metadata is given.
Merge pull request #127 from mlangill/issue120

Fix add_metadata.py when existing metadata