Fix: strip .json off the end of -s param (helps copy and paste for users)
Fix: strip .json off the end of -t param (helps copy and paste for users)
Merge pull request #126 from datasift/feature/PEBKAC-switches

Feature/pebkac switches