Git alias changes. mergetool changed to emerge.

* Diff aliases now works.
* fpull/rpush replaced by actually doing fa and pull and rb and push.