Merge pull request #389 from jasonh-n-austin/develop_2.0

Cleaning up samples, parity between yaml and json - Close #559