fixing js2mode snippets to something more friendly
Merge branch 'master' of https://github.com/anas-ambri/emacs.d
Merge branch 'master' of https://github.com/anas-ambri/emacs.d into work
Adding octave-mode
Adding line/column-mode, adding uniquify
Merging with master