Aggregate feature files

* Didn't see much reason to keep them separated
* Also, added a test for 27eca45
Update readme