Add ability to merge.

- Add merge function with ff_only option
- Fix exception handling to provide helpful messages
- Add GitbotGitException for easily capturing git related exceptions.