seperate template into includes
Merge pull request #5 from dannywils/master

merge master to gh-pages