Updated config as part of 1.6 testing and fixes
Updated gitignore