Merge pull request #1 from tsal/master

Initial template with settings_dist.py as a starter - mainline merge.
added more app template stuff
Merge pull request #2 from talkinlocal/develop

added more app template stuff
Merge pull request #3 from talkinlocal/master

updating master