Merge branch 'develop' of https://github.com/kakakaya/dotfiles into develop
init.el:not must require twittering-mode, emms
zshrc:added npm config