pre pull merge commit
Merge branch 'master' of https://github.com/endrebak/dotfiles

bla
updated