removed tab from travis.yml
added badges to readme
Merge branch 'dev'