Merge common Python (Not ready yet)

Need to go through and fix whatever we broken in Sublime. I know we changed the behavior of api.py, among other things.