Updated downtime to fix false IP changes
Merge branch 'master' into local
updated aliases at intel
Merge remote-tracking branch 'origin'
Merge branch 'master' of ssh://r2m/repositories/hershal/conf.d
the em alias should open emacs directly in the tty
merged with local configs
removed editor listing from git config

Why list it in the git config when it's clearly already in EDITOR?
Merge branch 'master' of ssh://r2m.mine.nu/repositories/hershal/conf.d