Changed settings
Merge branch 'master' of github.com:civicdata/civicdata.github.io