Merge lookup command into master

All the tests for the lookup command currently pass, @salspaugh can you take a look at it?