Trim out the empty fields so we don't get extra whitespace.
Merge pull request #6 from jordandukart/7.x

Trim out the empty fields so we don't get extra whitespace.