bump version 1.0.4
Merge branch 'release-1.0.5'

Conflicts:
	README.md
	mtools/version.py
changed company name from 10gen to MongoDB, Inc. in the disclaimer.
made pymongo MongoClient import back/forward compatible. closes #93.
fixed bug where line_str property was defined twice, old and new version.
removed debug print out from test_mlogfilter.
removed zero-padding from days in ctime format.
updated setup.py to work without setuptools (list_packages wasn't present).
added --json output option to mlogfilter. removed all references to previous tool mlog2json.
small change to decoding stuff from file log line
correction of utf8 encoding problem
Merge branch 'master' of github.com:nleite/mtools into nleite-master
undo of some unnecessary whitespace changes.
added Apache v2 Open Source license.
restructured mloginfo to have sections

added restarts section
added distinct section
added connection section.
removed mlogdistinct from scripts / setup.

now in mloginfo --distinct.
changed parameter name from --datetime-format to --timestamp-format.
Merge branch 'develop' of github.com:gianpaj/mtools into gianpaj-develop
Merge pull request #98 from gianpaj/develop

Fix #65 mtools - Bug on socket availability check
Merge branch 'gianpaj-develop' into develop