Add badges
Fix travis-CI link
Merge branch 'master' into feature/use-system-proxy