Adding badges
Merge branch 'travis' into v1.2