first cut scripts to engage travis ci
Merge branch 'master' into add-travis-ci

Conflicts:
	.travis-ci.sh
	.travis.yml