ignore npm log
edited aliases 'update' & 'listnpm'
Merge branch 'master' of https://github.com/maxfunke/dotfiles

* 'master' of https://github.com/maxfunke/dotfiles:
  Delete npm-debug.log

Merge from github to local