Update the .gitignore to ignore the civi setttings file
Merge branch 'master' of github.com:jblanford/community-site