Fix config file rebased

This patch squashes the many commits in #168.