Merge pull request #68 from ActivityRez/task-82778100-aaron

fixed time issue
handle blackout dates better