fix some bugs
Merge github.com:sjamesr/intellij-community

Conflicts:
	platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java