De-khanizing

@sefk

Not presently urgent to pull, but since I was cleaning up to make xcode work again, i figured I'd do this.

passes tests in jenkins.

even the networking class still looks ok in my dev.  and we can always branch from fall2012-master if necess.