don't end up in fuseki dir in init_fuseki.sh
add extra concept type information to test vocabulary, and update tests accordingly
hopefully fix travis test script
Merge branch 'master' into rest-fields-issue-22