Edit travis
Bump to version 0.15.1
Merge branch 'features'