Revert back to previous conditional import scheme. Revert unnecessary update to header search paths in TestJXLS project.
Update documentation with new umbrella header import code.