Drop more test only requirements from spec.
Merge branch 'master' of github.com:dgoodwin/tito