uimaj core trunk broken - ran out of time doing commits - will finish tomorrow

[Marshall Schor]

I apologize for leaving the trunk in a not quite committed state...

-Marshall