Feature/book 673 STILL WIP

You don't need the underscore for partials if the partial template has the underscore in the name.