New SCHEMA_MERGE SQL opts, CSV defaults used

Added ability to specify SCHEMA_MERGE with the following options
	-ALTER
	-VIEW
	-AUTO
if no option is given, default is set, which is currently alter, but should be auto in the future.
Additionally, wheneven SCHEMA_MERGE appears, default LOAD DATA INFILE options are changed
to allow for CSV parsing without specifying them all explicitely.
Merged my changes in.

Conflicts:
	sql/adapt_schema.cc
	sql/adapt_schema.h
	sql/sql_load.cc
Various enum fixes.

Placed Type enum from computerNextSchema.h into a class TypeWrapper to avoid multiple declaration conflicts.
Extended the case statement in adapt_schema.h to handle all of the enum types.
Added some includes for linux compatability.