added additional options to merge task with tests
add documentation for new merge options
Merge pull request #62 from dylancwood/git_merge_options

More Git merge options