gitignore updated after f.labs config; /html/templates (amend)
Merge branch 'master' of https://github.com/thomjamesallen/stuffee