Set up on travis
Merge branch 'v0.7'