Renamed some options and allowed multiple --include files to be specified.

Improved command line option handling.