Aric's fix to gettime
Merge branch 'master' of https://github.com/regehr/advanced_os_class into Aric