Update to take config files
Merge branch 'master' of github.com:farleyknight/masheri