Add rasterio.rio to setup's packages.

Also add a couple tests that had been missed.

For #137.

rasterio/rio/cli.py

@@ -3,6 +3,7 @@ import sys
 
 import click
 
+from rasterio.rio import options
 
 def configure_logging(verbosity):
     log_level = max(10, 30 - 10*verbosity)
@@ -11,8 +12,8 @@ def configure_logging(verbosity):
 
 # The CLI command group.
 @click.group(help="Rasterio command line interface.")
-@click.option('--verbose', '-v', count=True, help="Increase verbosity.")
-@click.option('--quiet', '-q', count=True, help="Decrease verbosity.")
+@options.verbose
+@options.quiet
 @click.pass_context
 def cli(ctx, verbose, quiet):
     verbosity = verbose - quiet

setup.py

@@ -156,7 +156,7 @@ setup(name='rasterio',
       url='https://github.com/mapbox/rasterio',
       license='BSD',
       package_dir={'': '.'},
-      packages=['rasterio'],
+      packages=['rasterio', 'rasterio.rio'],
       entry_points='''
         [console_scripts]
         rio=rasterio.rio.rio:cli