Updating git config

- Adding intellij as the default diff and merge tool
- Pruning unused and silly aliases
- Adding "fap" alias as "fetch --all --prune"