Clean up
Fix bug in join and sleep_for
Rename variables to remove underscores
Fix for do_timed_wait

Should work with vtimer(&now), but it seems I am using it wrong?
Need to figure out why it does not work the way I expect it to.