Polish merge

<3 @tomwans
auto-fill-mode
MAN_WIDTH