added clearcase and nyan-mode
Fixed merge conflict