Re-enabled CEDET; removed browser-kill-ring; adjusted some settings