diff --git a/AUTHORS b/AUTHORS
index 28b8ebd2..fdfb82fb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,8 @@
 - Tobias Sauerwein <cgtobi@gmail.com>
 - Alli Witheford <alzeih@gmail.com>
 - Alexandre Petitjean <alpetitjean@gmail.com>
+- Terje Larsen <terlar@gmail.com>
 - Pavol Babincak <scroolik@gmail.com>
 - Javier Domingo <javierdo1@gmail.com>
+- Javier Domingo Cansino <javier.domingo@fon.com>
 - Lasse Bigum <lasse@bigum.org>
diff --git a/MANIFEST.in b/MANIFEST.in
index 84122dcc..f1968205 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,6 @@ include *.rst
 include LICENSE
 include MANIFEST.in
 include data/mopidy.desktop
-include pylintrc
 
 recursive-include docs *
 prune docs/_build
diff --git a/docs/ext/index.rst b/docs/ext/index.rst
index a4f376b2..f798b962 100644
--- a/docs/ext/index.rst
+++ b/docs/ext/index.rst
@@ -106,7 +106,7 @@ Mopidy-SoundCloud
 
 https://github.com/mopidy/mopidy-soundcloud
 
-rovides a backend for playing music from the `SoundCloud
+Provides a backend for playing music from the `SoundCloud
 <http://www.soundcloud.com/>`_ service.
 
 
diff --git a/docs/index.rst b/docs/index.rst
index c5183471..17a40c32 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -30,7 +30,7 @@ Usage
 =====
 
 .. toctree::
-    :maxdepth: 3
+    :maxdepth: 2
 
     installation/index
     installation/raspberrypi
diff --git a/tests/backends/local/library_test.py b/tests/backends/local/library_test.py
index bc7181eb..c0843dd5 100644
--- a/tests/backends/local/library_test.py
+++ b/tests/backends/local/library_test.py
@@ -11,7 +11,7 @@ from mopidy.models import Track, Album, Artist
 from tests import path_to_data_dir
 
 
-class LocalLibraryControllerTest(unittest.TestCase):
+class LocalLibraryProviderTest(unittest.TestCase):
     artists = [
         Artist(name='artist1'),
         Artist(name='artist2'),
diff --git a/tests/backends/local/playback_test.py b/tests/backends/local/playback_test.py
index c37eb91d..5df86dd1 100644
--- a/tests/backends/local/playback_test.py
+++ b/tests/backends/local/playback_test.py
@@ -19,7 +19,7 @@ from tests.backends.local import generate_song, populate_tracklist
 # TODO Test 'playlist repeat', e.g. repeat=1,single=0
 
 
-class LocalPlaybackControllerTest(unittest.TestCase):
+class LocalPlaybackProviderTest(unittest.TestCase):
     config = {
         'local': {
             'media_dir': path_to_data_dir(''),
diff --git a/tests/backends/local/playlists_test.py b/tests/backends/local/playlists_test.py
index 4975d8aa..a9f13974 100644
--- a/tests/backends/local/playlists_test.py
+++ b/tests/backends/local/playlists_test.py
@@ -15,7 +15,7 @@ from tests import path_to_data_dir
 from tests.backends.local import generate_song
 
 
-class LocalPlaylistsControllerTest(unittest.TestCase):
+class LocalPlaylistsProviderTest(unittest.TestCase):
     backend_class = actor.LocalBackend
     config = {
         'local': {
diff --git a/tests/backends/local/tracklist_test.py b/tests/backends/local/tracklist_test.py
index 1993d246..a58bf5f6 100644
--- a/tests/backends/local/tracklist_test.py
+++ b/tests/backends/local/tracklist_test.py
@@ -14,7 +14,7 @@ from tests import path_to_data_dir
 from tests.backends.local import generate_song, populate_tracklist
 
 
-class LocalTracklistControllerTest(unittest.TestCase):
+class LocalTracklistProviderTest(unittest.TestCase):
     config = {
         'local': {
             'media_dir': path_to_data_dir(''),