Add a couple more badges, switch to badges.io