remove the need for settings/local.py (bug 1021991)
Merge pull request #261 from andymckay/999774

remove the need for settings/local.py (bug 999774)
missing file
fix Can't write; duplicate key in table '#sql-7fb2_1e48e71'
stop funfactory complaining
Merge pull request #268 from andymckay/fix-deploy

fix Can't write; duplicate key in table '#sql-7fb2_1e48e71'
add in terms and fix up urls
Merge pull request #269 from andymckay/zippy-zamboni-fixin

add in terms and fix up urls