Make it work on Debian
Make it work on Debian
Add JSON mode
Configure Jedi mode
Use scala-mode2
Disable Cedet configuration for now
Update Scala version used by ensime
Run Emacs client in background by default
Add join lines key shortcut
Customize Magit Face
Fix multiple cursor configuration
Add smart forward config
Add Ack and Ag Helm support
Ignore some files
Merge branch 'master' into HEAD

Conflicts:
	packages/.loaddefs.el
	packages/.status.el