Fixes #270 - tests for comments.

I'm just going to pull this in if Travis passes. Nothing very interesting to review, IMO. Comments and patches welcome, of course. :sunglasses: