tweak docstrings

This fixes section names:
  Arguments -> Args
  Return -> Returns

It also fixes the last line of the docstring so it isn't cuddled.

And we fix a few docstrings that should be one line but aren't.

BUG=None
TEST=`./buildbot/run_tests` passes

Change-Id: Iaafb7d346a3aee97a40dab340463894c02533091
Reviewed-on: https://chromium-review.googlesource.com/176279
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cros_merge_to_branch.py b/scripts/cros_merge_to_branch.py
index e9ff69e..20e17cb 100644
--- a/scripts/cros_merge_to_branch.py
+++ b/scripts/cros_merge_to_branch.py
@@ -31,7 +31,8 @@
 
 For more information on how to do this yourself you can go here:
 http://dev.chromium.org/chromium-os/how-tos-and-troubleshooting/working-on-a-br\
-anch"""
+anch
+"""
 
 import errno
 import logging