Tidy roadmap a little

Most of this probably should move to the development blog