Add new type annotations
Merge branch 'master' of https://github.com/williambuckley/redknapp