Add travis integration
Merge branch 'master' into pjl-misc