Fixes travis, adds badges