Added git mode support for merging, rebasing, and bisecting

<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
Remove mailcatcher

The mailcatcher gem does not work correctly when executed through Bundler.
Merge pull request #2685 from delynn/patch-2

Remove mailcatcher from bundler plugin
Merge pull request #2633 from redsunsoft/agnoster-theme-git-mode-addition

Added git support for merging, rebasing, and bisecting to agnoster theme
Merge remote-tracking branch 'upstream/master'