Use :update! instead of :w!
Merge branch 'master' of ssh://github.com/joshtch/dotfiles