Merge pull request #88 from sfoley/master

YML load capabilities for Instrument dicts
Fixed some issues with parameter dict loading