Updating badges to use v1.2
Merge branch 'travis' into v1.2