Fixes to make plugin compatible with current IntelliJ 13 EAP build (issues #11 & #5)