Update dev docs
Automatic Py3k merge for testing