cleaning up a bunch of stuff in preparation for 0.11 (especially with regards to doc and contrib handling)