diff --git a/features/core.feature b/features/core.feature
index 08f7aea8..ab86da42 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -47,3 +47,14 @@ Feature: Basic reading and writing to a journal
         When we run "jrnl -v"
         Then we should get no error
         Then the output should contain "version"
+
+    Scenario: --short displays the short version of entries (only the title)
+        Given we use the config "basic.yaml"
+        When we run "jrnl -on 2013-06-10 --short"
+        Then the output should be "2013-06-10 15:40 Life is good."
+
+    Scenario: -s displays the short version of entries (only the title)
+        Given we use the config "basic.yaml"
+        When we run "jrnl -on 2013-06-10 -s"
+        Then the output should be "2013-06-10 15:40 Life is good."
+
diff --git a/jrnl/cli.py b/jrnl/cli.py
index 389afc0a..11388ca7 100644
--- a/jrnl/cli.py
+++ b/jrnl/cli.py
@@ -38,7 +38,7 @@ def parse_args(args=None):
     reading.add_argument('-n', dest='limit', default=None, metavar="N", help="Shows the last n entries matching the filter. '-n 3' and '-3' have the same effect.", nargs="?", type=int)
 
     exporting = parser.add_argument_group('Export / Import', 'Options for transmogrifying your journal')
-    exporting.add_argument('--short', dest='short', action="store_true", help='Show only titles or line containing the search tags')
+    exporting.add_argument('-s', '--short', dest='short', action="store_true", help='Show only titles or line containing the search tags')
     exporting.add_argument('--tags', dest='tags', action="store_true", help='Returns a list of all tags and number of occurences')
     exporting.add_argument('--export', metavar='TYPE', dest='export', choices=plugins.BaseExporter.PLUGIN_NAMES, help='Export your journal. TYPE can be %s.' % plugins.BaseExporter.get_plugin_types_string(), default=False, const=None)
     exporting.add_argument('-o', metavar='OUTPUT', dest='output', help='Optionally specifies output file when using --export. If OUTPUT is a directory, exports each entry into an individual file instead.', default=False, const=None)
diff --git a/setup.py b/setup.py
index a4a0488b..526dc7d6 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ If you just call jrnl you will be prompted to compose your entry - but you can a
 Links
 `````
 
-* `website & documentation <http://maebert.github.com/jrnl>`_
+* `website & documentation <http://www.jrnl.sh>`_
 * `GitHub Repo <https://github.com/maebert/jrnl>`_
 
 """
@@ -45,7 +45,7 @@ import os
 import sys
 import re
 try:
-    import readline
+    import readline  # NOQA
     readline_available = True
 except ImportError:
     readline_available = False
@@ -80,15 +80,15 @@ setup(
     description="A command line journal application that stores your journal in a plain text file",
     packages=['jrnl'],
     install_requires=[
-        "pyxdg>=0.19",
         "parsedatetime>=1.2",
         "pytz>=2013b",
         "six>=1.7.4",
         "cryptography==0.8.1",
         "tzlocal>=1.1",
-        "PyYAML>=3.11",
+        "pyyaml>=3.11",
         "keyring>=3.3",
         "passlib>=1.6.2",
+        "pyxdg>=0.25",
     ] + [p for p, cond in conditional_dependencies.items() if cond],
     long_description=__doc__,
     entry_points={