removed osicat from defaults... lisp in summer projects feel free to ignore this commit
Merge remote-tracking branch 'origin/master'