Merge common Python

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