diff --git a/AUTHORS.txt b/AUTHORS.txt
index ce7c1d60..668d6576 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -7,7 +7,7 @@ Takafumi Arakaki (@tkf) <aka.tkf@gmail.com>
 Code Contributors
 =================
 
-Danilo Bargen (@dbrgn) <gezuru@gmail.com>
+Danilo Bargen (@dbrgn) <mail@dbrgn.ch>
 Laurens Van Houtven (@lvh) <_@lvh.cc>
 Aldo Stracquadanio (@Astrac) <aldo.strac@gmail.com>
 Jean-Louis Fuchs (@ganwell) <ganwell@fangorn.ch>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 84d0de15..52934901 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,29 +12,30 @@ Changelog
 0.8.0 (2014-05-05)
 +++++++++++++++++++
 
-* Memory Consumption for compiled modules (e.g. builtins, sys) has been reduced
-    drastically. Loading times are down as well (it takes basically as long as
-    an import).
-* REPL completion is starting to become usable.
-* Various small API changes. Generally this released focuses on stability and
-    refactoring of internal APIs.
-* Introducing operator precedence, which makes calculating correct Array
-    indices and ``__getattr__`` strings possible.
+- Memory Consumption for compiled modules (e.g. builtins, sys) has been reduced
+  drastically. Loading times are down as well (it takes basically as long as an
+  import).
+- REPL completion is starting to become usable.
+- Various small API changes. Generally this released focuses on stability and
+  refactoring of internal APIs.
+- Introducing operator precedence, which makes calculating correct Array indices
+  and ``__getattr__`` strings possible.
 
 0.7.0 (2013-08-09)
 ++++++++++++++++++
-* switched from LGPL to MIT license
-* added an Interpreter class to the API to make autocompletion in REPL possible.
-* added autocompletion support for namespace packages
-* add sith.py, a new random testing method
+
+- Switched from LGPL to MIT license
+- Added an Interpreter class to the API to make autocompletion in REPL possible.
+- Added autocompletion support for namespace packages
+- Add sith.py, a new random testing method
 
 0.6.0 (2013-05-14)
 ++++++++++++++++++
 
-* much faster parser with builtin part caching
-* a test suite, thanks @tkf
+- Much faster parser with builtin part caching
+- A test suite, thanks @tkf
 
 0.5 versions (2012)
 +++++++++++++++++++
 
-* Initial development
+- Initial development
diff --git a/docs/docs/usage.rst b/docs/docs/usage.rst
index 13e25987..960ca2ab 100644
--- a/docs/docs/usage.rst
+++ b/docs/docs/usage.rst
@@ -43,8 +43,9 @@ TextMate:
 
 Kate:
 
-- Kate_ version 4.13+ supports it natively, you have to enable it, though. [`proof
-  <https://projects.kde.org/projects/kde/applications/kate/repository/show?rev=KDE%2F4.13>`_]
+- Kate_ version 4.13+ `supports it natively
+  <https://projects.kde.org/projects/kde/applications/kate/repository/entry/addons/kate/pate/src/plugins/python_autocomplete_jedi.py?rev=KDE%2F4.13>`__,
+  you have to enable it, though.
 
 
 .. _other-software:
@@ -84,3 +85,4 @@ Using a custom ``$HOME/.pythonrc.py``
 .. _SynJedi: http://uvviewsoft.com/synjedi/
 .. _wdb: https://github.com/Kozea/wdb
 .. _TextMate: https://github.com/lawrenceakka/python-jedi.tmbundle
+.. _kate: http://kate-editor.org/
diff --git a/jedi/parser/tokenize.py b/jedi/parser/tokenize.py
index 6587265d..40ecab1b 100644
--- a/jedi/parser/tokenize.py
+++ b/jedi/parser/tokenize.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 """
 This tokenizer has been copied from the ``tokenize.py`` standard library
-tokenizer. The reason was simple: The standanrd library  tokenizer fails
+tokenizer. The reason was simple: The standard library tokenizer fails
 if the indentation is not right. The fast parser of jedi however requires
 "wrong" indentation.
 
 Basically this is a stripped down version of the standard library module, so
 you can read the documentation there. Additionally we included some speed and
-memory optimizations, here.
+memory optimizations here.
 """
 from __future__ import absolute_import