changed dir in conf
changed dir in conf
changed txt in conf
Merge pull request #1 from Jcrowley/master

Pull to gh pages