Non MBARI branch

removed most MBARI specific configuration