Only make an error if there's actually an error

Yikes, forgot ListPackages in metrics instruments

Sort map-rand-ed results in bzr source test

Merge branch 'default-branch'

Merge pull request sdboyer#91 from sdboyer/fix-netname

Fix issues with alternate net names

Touch up some docblocks

Merge branch 'overrides'

Merge branch 'improved-trace'

Fix disallowed test, now that dots are out again

It Is Decided: Merge branch 'gps'