Small cleanup.
Add cassowary deps but can't figure out how to use 'em for non-linear constraints. Add basic point merging in a non-general way.