Up .gitignore and add sites/default/default.settings.php file
Merge branch 'core' into contrib