added test files
added cson/yaml/json options
Merge branch 'yaml'
working on tests