fixed up the time stamp parser, long and short of it... java DateTime sucks
merge