Ready for 1.6a1. Reordered the defines to be in line with config.h.in again, so tracking the new defines will be easier in future.
Ready for 1.6a1. Reordered the defines to be in line with config.h.in again, so tracking the new defines will be easier in future.

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