consistent whitespace across the .rst docs, some minor corrections
Fix merge conflicts