Merge pull request #960 from Tendrid/develop

Develop
Updates to yaml builder
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #961 from ahomatthew/develop

Develop
Moar stuff for yaml building
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #962 from ahomatthew/develop

Develop