Rearrange item defs a bit.
Merge branch 'master' of ssh://git@github.com/jdoda/uncooperative.git