Initial repo.
General config options.
Merge remote-tracking branch 'github/master' into github