update conf
Merge branch 'master' of https://github.com/fabricematrat/fabricematrat.github.com