SWC-526 and SWC-527 - genomespace integration
Merge pull request #325 from dburdick/swc-526

SWC-526 and SWC-527 - genomespace integration