Merge branch 'master' into cursor-tracking

Conflicts:
	rtv/content.py

README.rst

@@ -28,13 +28,13 @@ RTV is built in **python** using the **curses** library.
 Installation
 ============
 
-Install using pip...
+Install using pip (**recommended**)
 
 .. code-block:: bash
 
     $ pip install rtv
 
-or clone the repository.
+or clone the repository
 
 .. code-block:: bash
 
@@ -42,6 +42,15 @@ or clone the repository.
     $ cd rtv
     $ python3 setup.py install
 
+on Arch Linux or Arch based distros (Antergos, Manjaro, `etc.`_) you can install directly using an `aur helper`_ such as yaourt. There's also an *rtv-git* package if you wish to keep up to date with the latest development code.
+
+.. code:: bash
+
+    $ yaourt -S rtv
+
+.. _etc.: https://wiki.archlinux.org/index.php/Arch_based_distributions_(active)
+.. _aur helper: https://wiki.archlinux.org/index.php/AUR_helpers#AUR_search.2Fbuild_helpers
+
 =====
 Usage
 =====
@@ -62,16 +71,16 @@ Move the cursor using either the arrow keys or *Vim* style movement
 - Press **right** to view the selected submission and **left** to return.
 - Press **?** to open the help screen.
 
-See `CONTROLS.rst <https://github.com/michael-lazar/rtv/blob/master/CONTROLS.rst>`_ for the complete list of available commands.
+See `CONTROLS <https://github.com/michael-lazar/rtv/blob/master/CONTROLS.rst>`_ for the complete list of available commands.
 
 --------------
 Authentication
 --------------
 
-RTV enables you to login to your reddit account in order to perform actions like voting and leave comments.
+RTV enables you to login to your reddit account in order to perform actions like voting and leaving comments.
 The login process uses OAuth [#]_ and follows these steps:
 
-1. Initiate a login by pressing the ``u`` key.
+1. Initiate the login by pressing the ``u`` key.
 2. Open a new webpage where reddit will ask you to authorize the application.
 3. Click **Accept**.
 
@@ -180,7 +189,7 @@ How do I run the tests?
 =========
 Changelog
 =========
-Please see `CHANGELOG.rst <https://github.com/michael-lazar/rtv/blob/master/CHANGELOG.rst>`_.
+Please see `CHANGELOG <https://github.com/michael-lazar/rtv/blob/master/CHANGELOG.rst>`_
 
 =======
 License

rtv/__init__.py

@@ -1,4 +1,30 @@
 # -*- coding: utf-8 -*-
+"""
+________     __________________________
+___  __ \__________  /_____  /__(_)_  /_
+__  /_/ /  _ \  __  /_  __  /__  /_  __/
+_  _, _//  __/ /_/ / / /_/ / _  / / /_
+/_/ |_| \___/\__,_/  \__,_/  /_/  \__/
+
+
+________                      _____              ______
+___  __/__________________ ______(_)____________ ___  /
+__  /  _  _ \_  ___/_  __ `__ \_  /__  __ \  __ `/_  /
+_  /   /  __/  /   _  / / / / /  / _  / / / /_/ /_  /
+/_/    \___//_/    /_/ /_/ /_//_/  /_/ /_/\__,_/ /_/
+
+
+___    ______
+__ |  / /__(_)_______      ______________
+__ | / /__  /_  _ \_ | /| / /  _ \_  ___/
+__ |/ / _  / /  __/_ |/ |/ //  __/  /
+_____/  /_/  \___/____/|__/ \___//_/
+
+
+(RTV)
+"""
+
+
 from __future__ import unicode_literals
 
 from .__version__ import __version__
@@ -6,4 +32,4 @@ from .__version__ import __version__
 __title__ = 'Reddit Terminal Viewer'
 __author__ = 'Michael Lazar'
 __license__ = 'The MIT License (MIT)'
-__copyright__ = '(c) 2015 Michael Lazar'
+__copyright__ = '(c) 2016 Michael Lazar'

rtv/content.py

@@ -443,7 +443,6 @@ class SubredditContent(Content):
                 raise IndexError
             else:
                 data = self.strip_praw_submission(submission)
-                #data['index'] = len(self._submission_data)
                 data['index'] = len(self._submission_data) + 1
                 # Add the post number to the beginning of the title
                 data['title'] = '{0}. {1}'.format(data['index'], data['title'])