Swapped last two entries in .gitignore to reflect the order in which they happened
Put an empty placeholder (.gitignore) in the scala-mode directory so that it can be added
Jedi.el configuration
Merge branch 'jedi' of github.com:fdelacruz/emacs-starter-kit into jedi