More Git merge options

Add five new options to the git-merge task:
* --commit
* --no-commit
* --edit
* --no-edit
* -m <message>

I've also added testing and documentation.

Please let me know if you would like me to change anything.