Revert "Return items with location and item type?"

This reverts commit b61ea98352aeb04c8ba8a764b4712062ee6b8cb7.
Revert "Revert "Return items with location and item type?""

This reverts commit 1a9e6505b7f2bcf52660e904794242dc0e152a62.
Merge branch 'master' of https://github.com/markfinney/lara