Update project with tests, latest versions.

Hey sorry for the long commit list - I should have forked and rebased.
Here are some contributions I made to your template if you'd like them.

Cheers - thanks for making this.