pulled IContext and IBuildSession apart.  Closes GH-159