Ping and some templating stuff
Merge pull request #14 from lukemcgregor/master

Ping and some templating stuff