over the summer changes
reconfiguring for bitmessage.ch
Merge branch 'master' of https://github.com/Vaskozl/dotfiles
because of different computers.