Merge branch 'master' into devel

Update to 1.004
Ensure contour clockwise
Remove self-intersection separator
Comment out self-intersection detection
Make contours clockwise before smoothing
Set version 1.005
Set correct width
Merge branches 'topic/width' and 'topic/scaling' into devel
Round to int before removing overlaps
Merge branch 'topic/scaling' into devel
Add cache to enable retry
Limit scale factor
Do simple process first
Retry automatically
Add ContourError class
Retry without reload
Limit working scale
Reintroduce self-intersection separator
Remove self-intersections before removing overlaps
Merge branch 'topic/selfintersect' into topic/cache

Conflicts:
	mkmkfile.rb