several changes
Merge branch 'master' of https://github.com/anders-dc/dotfiles