Add Tim and Josh, not sure of proper time
Merge branch 'authors-update'