turtle fixes post-merge with editCode
Merge pull request #464 from code-dot-org/turtle_merge_cleanup

turtle fixes post-merge with editCode