Some cleanup and added CVS directory to .ignore