add npm completion
Conflict Merge
tmux 1.9