bump version info, fix travis badge
Merge branch 'dev'