Added travis.yml
Merge branch 'lee' into develop