fixed a parser error
updated mixer to support mergin
readd fastjet tarball
don't delete tarball
sherpa list
list
minor updates
removed CVS garbage