Cleanup of files that did not need to be modified.
Merge branch 'for_chris' of https://github.com/SnookEE/cocotb into for_chris