Merge branch 'master' of git://github.com/paulmillr/dotfiles
-m Update my settings