Tests to clarify glob patterns
wip
Refactor and improve integration tests
Move .stversions to repo root only (fixes #364)
Merge branch 'master' into segidx

* master:
  Move .stversions to repo root only (fixes #364)
  Refactor and improve integration tests
  Tests to clarify glob patterns

Conflicts:
	integration/test-merge.sh