revert back to timestamps, fix a couple other bugs
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
cleanup debug
cleanup debug
debug cleanup and change to Particle::update() to handle clock skew slightly better
Merge pull request #1410 from ZappoMan/bugfixes

Bug fixes