diff --git a/idea b/idea
new file mode 100755
index 000000000..c3e170967
--- /dev/null
+++ b/idea
@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import socket
+import struct
+import sys
+import os
+import time
+
+# see com.intellij.idea.SocketLock for the server side of this interface
+
+RUN_PATH = u'/home/nikvolf/idea/bin/idea.sh'
+CONFIG_PATH = u'/home/nikvolf/.IdeaIC15/config'
+
+args = []
+skip_next = False
+for i, arg in enumerate(sys.argv[1:]):
+    if arg == '-h' or arg == '-?' or arg == '--help':
+        print(('Usage:\n' +
+               '  {0} -h |-? | --help\n' +
+               '  {0} [-l|--line line] file[:line]\n' +
+               '  {0} diff <left> <right>' +
+               '  {0} merge <local> <remote> [base] <merged>').format(sys.argv[0]))
+        exit(0)
+    elif arg == 'diff' and i == 0:
+        args.append(arg)
+    elif arg == 'merge' and i == 0:
+        args.append(arg)
+    elif arg == '-l' or arg == '--line':
+        args.append(arg)
+        skip_next = True
+    elif skip_next:
+        args.append(arg)
+        skip_next = False
+    else:
+        if ':' in arg:
+            file_path, line_number = arg.rsplit(':', 1)
+            if line_number.isdigit():
+                args.append('-l')
+                args.append(line_number)
+                args.append(os.path.abspath(file_path))
+            else:
+                args.append(os.path.abspath(arg))
+        else:
+            args.append(os.path.abspath(arg))
+
+
+def launch_with_port(port):
+    found = False
+
+    s = socket.socket()
+    s.settimeout(0.3)
+    try:
+        s.connect(('127.0.0.1', port))
+    except:
+        return False
+
+    while True:
+        try:
+            path_len = struct.unpack(">h", s.recv(2))[0]
+            path = s.recv(path_len)
+            if os.path.abspath(path) == os.path.abspath(CONFIG_PATH):
+                found = True
+                break
+        except:
+            break
+
+    if found:
+        if args:
+            cmd = "activate " + os.getcwd() + "\0" + "\0".join(args)
+            encoded = struct.pack(">h", len(cmd)) + cmd
+            s.send(encoded)
+            time.sleep(0.5)  # don't close socket immediately
+        return True
+
+    return False
+
+
+port = -1
+try:
+    f = open(os.path.join(CONFIG_PATH, 'port'))
+    port = int(f.read())
+except Exception:
+    type, value, traceback = sys.exc_info()
+    print('No IDE instance has been found. New one will be started.')
+    port = -1
+
+if port == -1:
+    # SocketLock actually allows up to 50 ports, but the checking takes too long
+    for port in range(6942, 6942 + 10):
+        if launch_with_port(port):
+            exit()
+else:
+    if launch_with_port(port):
+        exit()
+
+if sys.platform == "darwin":
+    # OS X: RUN_PATH is *.app path
+    if len(args):
+        args.insert(0, "--args")
+    os.execvp("open", ["-a", RUN_PATH] + args)
+else:
+    # unix common
+    bin_dir, bin_file = os.path.split(RUN_PATH)
+    os.execv(RUN_PATH, [bin_file] + args)
diff --git a/util/src/keys/store.rs b/util/src/keys/store.rs
index e122ce808..b8b0b0a47 100644
--- a/util/src/keys/store.rs
+++ b/util/src/keys/store.rs
@@ -207,7 +207,7 @@ mod tests {
 	use common::*;
 
 	#[test]
-	fn secret_store_insert() {
+	fn can_insert() {
 		let temp = RandomTempPath::create_dir();
 		let mut sstore = SecretStore::new_test(&temp);
 
@@ -218,7 +218,7 @@ mod tests {
 	}
 
 	#[test]
-	fn secret_store_get_fail() {
+	fn can_get_fail() {
 		let temp = RandomTempPath::create_dir();
 		{
 			use keys::directory::{KeyFileContent, KeyFileCrypto};
@@ -260,7 +260,7 @@ mod tests {
 	}
 
 	#[test]
-	fn secret_store_get() {
+	fn can_get() {
 		let temp = RandomTempPath::create_dir();
 		let key_id = {
 			use keys::directory::{KeyFileContent, KeyFileCrypto};
@@ -283,7 +283,7 @@ mod tests {
 	}
 
 	#[test]
-	fn secret_store_delete() {
+	fn can_delete() {
 		let temp = RandomTempPath::create_dir();
 		let keys = pregenerate_keys(&temp, 5);