update and re-order history, fixes 220 [ci skip]
update and re-order history, fixes 220 [ci skip]

jobovy/galpy,followthesheep/galpy,jobovy/galpy,followthesheep/galpy,jobovy/galpy,jobovy/galpy,followthesheep/galpy,followthesheep/galpy