Merge pull request #1 from Trott/master

sync
Merge branch 'master' of github.com:Trott/clockdrift.js
Merge branch 'master' of github.com:Trott/clockdrift.js
Merge branch 'master' of github.com:Trott/clockdrift.js
Merge branch 'master' of github.com:Trott/clockdrift.js
Merge branch 'master' of github.com:Trott/clockdrift.js
Merge branch 'master' of github.com:Trott/clockdrift.js
Merge pull request #2 from ucsf-ckm/master

sync up