better docs

@charlierudolph this is inspired by one of your comments. Please take a look!  :)
This sounds too generic but can't think of a better description at the moment since it does different things for main/non-feature versus feature.