blah
Removes blank lines to satisfy flake8
Fixes tests and removes dead code.
Removes debug code.
Merge pull request #29 from buildingenergy/wip-branch-allow-concats-of-extra-data

Wip branch allow concats of extra data