Merge and coming back around.

"Merged" back from upstreamby just replacing the files that changes with the new changes coming in and then re-worked the changed files to make them more PEP8 compliant.