Kill rest

WIP pull request, not ready for merging yet.

I thought that having `features` and `features/rest` made sense, but it really doesn't. This is the first step of a greater reorganization of features.

I want to make sure things build on travis before I merge them into master, so i'm doing the work here.