removed a merge message i forgot
changed cvmfs configuration to reflect our recipie