Merge pull request #4 from enkore/py3k

Py3k
Merge pull request #5 from enkore/master

Refactored IO
Merge pull request #6 from enkore/master

Once again… I/O handling
Merge pull request #7 from enkore/master

Mailchecker, regex
battery checker added
clock added
remove unused import
register_module has been renamed to register
Merge pull request #8 from mjepronk/master

Two new modules (battery status and clock)
Merge branch 'master' of https://github.com/janoliver/i3pystatus
Fixed issue #9

Notmuch checker does not work in this state
NotmuchMailChecker does not work because of a conflict between the notmuch Python API and the file for NotmuchMailChecker which is also named notmuch.

I suggest to rename i3pystatus/notmuch.py to i3pystatus/notmuchchecker.py and modify main.py.dist appropriately.

Reported by mjepronk

Also removed some superfluous whitespace