Fix Travis-CI build; Add badges