Merge branch 'variants'
Add 'make version' recipe
Apply 'make version' recipe
Merge branch 'version' into variants
Add pen breadth option to make-outline.py