Add diagrams to Scaladoc generation
Fix ASCII edge parsing bug
Extract out preferences objects