Re-instated origami-build-tools install & test for Travis CI.
Updated demo and origami.json to new config style.