Update notes for submitted changes

* Replace unicode() with six.u()
Update notes for submitted changes

* replace basetring/xrange