Merge branch 'master' of github.com:misterbeebee/calisson-hs
working pretty fast now.
raise size limits, and turn off opacity of labels