Merge pull request #40 from stevendgonzales/master

Corrected conf files for mongo
Merge remote-tracking branch 'upstream/master'