Changed config settings
Merge branch 'blog'