removed the geo_exportermodule from being imported
fixed merge conflict
fixing merge conflicts
fixed houdini lighting file checkin
Merge pull request #147 from bkingery/master

Fixed houdini lighting file checkin