fixed conf
Merge branch 'master' of https://github.com/jbooth/maggiefs