added support for --include, --include-from and the +/- syntax