updated git ignore
mergingo mongo changes
Merge branch 'master' into importing