Update changes for demo setup#3

snsumner wants to merge 3 commits intochrisricci:canarychrisricci/python_api:canaryfrom

snsumner:canarysnsumner/python_api:canaryCopy head branch name to clipboard