clean custom settings
git ignore update
Merge branch 'master' of github.com:zxwild/djblog