Fixed various bugs with ordering of calls.
Update to new adventure load scheme using YAML instead of JSON
Update version to 2.1.1 in pom.xml