add travic.yml
bring master up to dates

Merge branch 'tests'