Added emacs to ignores
updated NPM path
fixing conflicts