Adding some dev settings to .gitignore and removing .htaccess from tracking
Updating contrib modules
Updating contrib modules Views and Ctools
Merge remote-tracking branch 'origin/master'