Tidy roadmap a little.

This could easily turn into a big long todo list.  Thoughts on how to make
it coherent gratefully accepted.
Merge branch 'master' into devel