Merge branch 'master' of https://github.com/trulleberg/Dotfiles
Adjusted the profile.d folder and the screenrc