Retab/trim, general cleanup, spelling

Just doing some cleanup before diving into fixing up some Vagrant warnings.