Added travis config & related stuff
Merge branch 'master' into summery