Simplify.
Turn off pydev tests as they blink.
fixed PY-14304 IPython Notebook: markdown cells in newly created files are not rendered properly
add registry key for merge vcs tool windows
Fix threading issue in console tests.
merged VCS toolwindows initial
Merge remote-tracking branch 'origin/master'
fixed PY-14304 IPython Notebook: markdown cells in newly created files are not rendered properly
Merge remote-tracking branch 'origin/master'
fixed PY-14380 PyCharm 4 EAP doesn't start on OS X
Merge remote-tracking branch 'origin/master'
do not add empty remote interpreter name to the list
IDEA-131455 (Unused import inspection doesn't (correctly) take inheritance into account)