Test after merging, d'oh
Merge branch 'master' of github.com:potentialventures/cocotb