Removed the types from the checkin, because some dipstick added them in. Also finished factoring out ErrorHandler, FileLocation, and Locatable - those are from when we parse XML files for Tupleflow jobs. No more of that.