use key lookups instead of linear array search
Merge branch 'master' of github.com:MindTouch/OpenContainer