project using 'cms'.  template inheritance etc
Merge branch 'master' of github.com:pkimber/cms