Tighten-up package and version resolution
Merge pull request #54 from dave-miles/packages

Tighten-up package and version resolution