From 139ff6c32ea61f1a9f2ebccce2cd6a087ab33f00 Mon Sep 17 00:00:00 2001
From: John Shanahan <shanahan.jrs@gmail.com>
Date: Tue, 3 Sep 2013 23:53:58 -0400
Subject: [PATCH] Merge

---
 cheat    | 4 ++--
 setup.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cheat b/cheat
index 9aa85e0..a8d3af7 100755
--- a/cheat
+++ b/cheat
@@ -141,8 +141,8 @@ def main():
     # create/edit option
     option = sys.argv[1].lower()
     if option in ['-e', '--edit', '-c', '--create']:
-        # make sure EDITOR environment variable is set and that at least 3 arguments
-        # are given
+        # make sure EDITOR env variable is set and that at least
+        # 3 arguments are given
         if 'EDITOR' not in os.environ:
             print('In order to use "create" or "edit" you must set your '
                   'EDITOR environment variable to your favorite editor\'s path')
diff --git a/setup.py b/setup.py
index c115c4c..38cf968 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,8 @@
 from distutils.core import setup
 import os
 
-setup(name='cheat',
+setup(
+      name='cheat',
       version='1.0',
       summary='Create and view interactive cheatsheets on the command-line',
       homepage='',