Restore `gd` functionality

- Makes `gd` only run `:Gdiff` again
- Adds `g3d` shortcut for the 3-way diff
Merge pull request #17 from alexdavid/gd_functionality

Restore `gd` functionality