We don't want templates.
Bump newlines and things.
TDD for the win
More tests.
Merge pull request #1 from phalt/develop

Develop