* Add further modules to README so that "annotate" will work. * Fix a deprecation warning. ok tobias@, sthen@