new template files
Merge branch 'master' of https://github.com/FraserCobb/Fairfax
updated cf templates