Merge pull request #89 from sfoley/master

minor, but important fixes for param dict loading
More yaml load fixes and some cleanup