Fix #17 (valence 2 edge collapse bug)

In response to #17...

* added failing test for new edge collapse test case
* improved other edge collapse related tests
* fixed #17 (see 3e972d3)

I've also identified another potential bug – reported in #18.

@indigo99, I would be very grateful if you could test this!