Changed ScheddarTime to not use the terrible Java Time API
Fixed a minor merge discrepency