Merge branch 'release/v1.2'

* release/v1.2:
  Updating release file.
  Add .multitail.conf as well as the multitail alias that uses that .multitail.conf file as the config.
  Set alias gffnr correctly.
  Reset gitconfig aliases back to normal ff and ffr.
  Rebase by default on gff
Merge branch 'master' of https://github.com/cobhimself/dotfiles into develop

* 'master' of https://github.com/cobhimself/dotfiles:
Updating aliases and multitail.conf