Branch Options more nodes stuff
Merge branch 'master' of https://github.com/huderlem/moongod