Removed references to ach_cancel.
Fixed issue with setting timeout for pthread_cond_wait.
Misc. updates.
Added notifications and timeouts to trajectory server. Trajectories working with hard-coded timeouts.
Merge branch 'no_cancel'