Merge branch 'py26-bundle-install' into develop

* py26-bundle-install:
  Actually zip the bundled dir
  Fix install script bug for error conditions
  Include argparse in py26 bundled install
Initial commit of new text output
Move text formatter to separate class

Makes testing easier as well.
More complex tests for text output
Recursively process list elements in text output
Update text formatter to stream pages
Add --query arg for filtering results

This allows a user to specify how he'd like the results filtered.
Add a test for jmespath query

This also included some refactorings to make testing the
CLI output easier.