Fix travis and added badges