Merge branch 'expandtab' of https://github.com/Carreau/jedi

Also modify the test a bit to make sure that it passes properly if there are
folders present.

jedi/api/file_name.py

@@ -17,6 +17,8 @@ def complete_file_name(inference_state, module_context, start_leaf, string,
     like_name_length = len(os.path.basename(string))
 
     addition = _get_string_additions(module_context, start_leaf)
+    if string.startswith('~'):
+        string = os.path.expanduser(string)
     if addition is None:
         return
     string = addition + string