badges, PyYAML + pre-testing fixes
Merge pull request #75 from routelastresort/master

badges, PyYAML + pre-testing fixes