Added default values for oci_include_dir and oci_lib_dir variables in binding.gyp (so if you don't have OCCI_INCLUDE_DIR and OCCI_LIB_DIR set in your environment, the default oracle locations will be used..
fix merge conflict