diff --git a/plugin/packages/wakatime/HISTORY.rst b/plugin/packages/wakatime/HISTORY.rst
index 4928abd..a166fd9 100644
--- a/plugin/packages/wakatime/HISTORY.rst
+++ b/plugin/packages/wakatime/HISTORY.rst
@@ -3,6 +3,18 @@ History
 -------
 
 
+2.1.6 (2014-11-18)
+++++++++++++++++++
+
+- fix list index error when detecting subversion project
+
+
+2.1.5 (2014-11-17)
+++++++++++++++++++
+
+- catch exceptions when getting current machine time zone
+
+
 2.1.4 (2014-11-12)
 ++++++++++++++++++
 
diff --git a/plugin/packages/wakatime/wakatime/__init__.py b/plugin/packages/wakatime/wakatime/__init__.py
index fa9b7cb..9292cc6 100644
--- a/plugin/packages/wakatime/wakatime/__init__.py
+++ b/plugin/packages/wakatime/wakatime/__init__.py
@@ -13,7 +13,7 @@
 from __future__ import print_function
 
 __title__ = 'wakatime'
-__version__ = '2.1.4'
+__version__ = '2.1.6'
 __author__ = 'Alan Hamlett'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2014 Alan Hamlett'
@@ -287,7 +287,10 @@ def send_action(project=None, branch=None, stats=None, key=None, targetFile=None
     request.add_header('Authorization', auth)
 
     # add Olson timezone to request
-    tz = tzlocal.get_localzone()
+    try:
+        tz = tzlocal.get_localzone()
+    except:
+        tz = None
     if tz:
         request.add_header('TimeZone', u(tz.zone))
 
diff --git a/plugin/packages/wakatime/wakatime/projects/subversion.py b/plugin/packages/wakatime/wakatime/projects/subversion.py
index 934bdaf..e1ed061 100644
--- a/plugin/packages/wakatime/wakatime/projects/subversion.py
+++ b/plugin/packages/wakatime/wakatime/projects/subversion.py
@@ -72,7 +72,8 @@ class Subversion(BaseProject):
                     if isinstance(line, bytes):
                         line = bytes.decode(line)
                     line = line.split(': ', 1)
-                    info[line[0]] = line[1]
+                    if len(line) == 2:
+                        info[line[0]] = line[1]
         return info
 
     def _find_project_base(self, path, found=False):
diff --git a/plugin/wakatime.vim b/plugin/wakatime.vim
index 34fdd3c..16b0501 100644
--- a/plugin/wakatime.vim
+++ b/plugin/wakatime.vim
@@ -43,7 +43,7 @@ let s:VERSION = '2.0.11'
     if !filereadable(expand("$HOME/.wakatime.cfg"))
         let key = input("[WakaTime] Enter your wakatime.com api key: ")
         if key != ''
-            call writefile(['[settings]', printf("api_key=%s", key)], expand("$HOME/.wakatime.cfg"))
+            call writefile(['[settings]', printf("api_key = %s", key), 'ignore =', '    ^COMMIT_EDITMSG$', '    ^TAG_EDITMSG$'], expand("$HOME/.wakatime.cfg"))
             echo "[WakaTime] Setup complete! Visit http://wakatime.com to view your logged time."
         endif
     endif