updated some author info
Merge branch 'master' into master_buffers_shmemwait
Merge branch 'master_buffers_shmemwait' into master_buffers_shmemwait_diagcomms