Added all changes in beta1 and beta3. Still very rough (needs reordering etc.).
Added all changes in beta1 and beta3.
Still very rough (needs reordering etc.).

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator