Fixed yaml load issues
Merge pull request #17 from fox-squirrels-2013/yyyyaml

Fixed yaml load issues