Merge branch 'fix-stray-browsers' into master-patched

* fix-stray-browsers:
  Listen for SIGINT and stop the process.
  Temporarily remove uncaughtException listeners.
Merge branch 'use-grunt-file-resolution' into master-patched

* use-grunt-file-resolution:
  Only add options if they are specified
  Document usage with Grunt's file config
  Use this.files, let Grunt do the file matching.