gaps, fix test for xmlgrep
Merge branch 'master' of github.com:eghm/rtools

Conflicts:
	bin/gap/labs.sh
	bin/gap/libs.sh
update saucelabs targets