Include link to new generated config.txt
Add explicit refs to troubleshooting
Move upgrade notification to the bottom
Add 'diagnostics' section to Windows
Simplify IPv6 instructions & link term
Add scc travis-merge to the Travis build
Set up Git config for scc travis-merge
Merge pull request #906 from sbesson/rebased/develop/fine-tune-config

Fine tune config (rebased onto develop)