update notes
Merge branch 'master' of github.com:fluffy/fluffyhome
update setting
move setting to template
ignroe settings.py