Updated GottWall config
Merge remote-tracking branch 'upstream/master'
Fixed README.rst.