Merge branch 'master' of http://github.com/x89/Shreddit

shreddit/app.py

@@ -55,4 +55,8 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except KeyboardInterrupt:
+        print("Shreddit aborted by user")
+        quit()

shreddit/shredder.py

@@ -107,7 +107,7 @@ class Shredder(object):
             output = {k: item.__dict__[k] for k in item.__dict__ if not k.startswith("_")}
             output["subreddit"] = output["subreddit"].title
             output["author"] = output["author"].name
-            json.dump(output, fh)
+            json.dump(output, fh, indent=2)
 
     def _remove_submission(self, sub):
         self._logger.info("Deleting submission: #{id} {url}".format(id=sub.id, url=sub.url.encode("utf-8")))