Pedantry

Clean up commits -- mostly adjusting whitespace.  Also, upgrade dependencies.