commit for å merge
Merge branch 'master' of github.com:Haakenlid/dotfiles

* 'master' of github.com:Haakenlid/dotfiles:
  merged with uio
  fikse config
det ble krøll med mergen