All the changes
Merge branch 'master' of https://github.com/oppenlander/dotfiles
Fixed merge conflicts
Fixed js2-mode and added some conf-mode settings