Pulling in novice shell lesson changes from swc master