Merge pull request #46 from ahalterman/master

Add lots of local sources
Merge pull request #47 from ahalterman/master

Add international/local/wire label to sources
Implement source-type filtering.
Merge pull request #48 from johnb30/source_filtering

Implement source-type filtering.
Update README
Logging options.
Merge pull request #49 from johnb30/master

Logging options.
Fixing logging.
Merge remote-tracking branch 'upstream/master'
Once more.