More yaml load fixes and some cleanup
Merge pull request #90 from sfoley/master

Another preventative fix...last one?