Merge branch 'cn' of github.com:thlorenz/dotfiles into cn

* 'cn' of github.com:thlorenz/dotfiles:
  using inconsolata in vimrc
  fixing font instructions
  adding custom global npm path
Merge branch 'cn' of github.com:thlorenz/dotfiles into cn

* 'cn' of github.com:thlorenz/dotfiles:
  adding remove white space on save to vimrc