Use a json data file instead of a yaml data file
Merge branch 'master' into haskell

Conflicts:
	ruby/lib/commands.yml