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
Merge branch 'cn' of github.com:thlorenz/dotfiles into cn

* 'cn' of github.com:thlorenz/dotfiles:
  adding remove white space on save to vimrc
  using inconsolata in vimrc
  fixing font instructions
  adding custom global npm path
Merge commit '7c35f21' into cn

* commit '7c35f21':
  adding more javascript snippets
Merge branch 'cn' of github.com:thlorenz/dotfiles into cn

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

* 'master' of github.com:thlorenz/dotfiles:
  improving html5 snippet
  adding test-debug snippet
  adjusting req snippets
  adjusting console snippets
  adding jshintrc to nstart template
fixing ce and cl snippets
adding node_modules to wild ignore for improved Ctrl-P experience