removed bad ref for undo tree
rm nxhtml wrong place
auto load nxhtml-mode for erb and html
added keybinding for expand region
tmp fix for issue 102
Merge branch 'master' of github.com:overtone/emacs-live
resolved conflict
new shit
added handlebars-mode
added coffee mode
scss-mode
merge with master
Added new colour themes
Added new colour themes
Merge branch 'feature/rails-pack' of github.com:martinffx/emacs-live into feature/rails-pack
stuff
a