Remove mongo-tools now built in go from .gitignore
Merge remote-tracking branch 'upstream/master'