Fixed indenting in conf files
Merge branch 'master' of github.com:uberVU/mozaic