updated some author info
Merge branch 'master' into master_arrays_shmemwait