Merged the code to update branches with the code to merge them. Added comments.
Added various formatting command line parameters