Update readme for travis
Merge branch 'dev'