Remove last of deprecation warnings, related to #47
Change to trim whitespace in header columns. Fixes #38, #49