EDITOR=vim
Merge remote-tracking branch 'havsule/master' into osx