Command line opt name improvements
reaveal_edges guesses a useful line width if not given
Merge branch 'master' into collapse-background