Json solution
Yaml solution
Yaml handles yml
Merge branch 'master' into author_answers

Conflicts:
	data/fileformats/reactions/formats/format_yaml.py