Update settings
Getting rid of scala-mode2 from github.
Add org-impress-js. Misc. enhancements
Merge branch 'master' of https://github.com/gneuvill/Emacs-Configuration

Conflicts:
	customize-settings.el
	dist/elisp/scala-mode2
	dist/elpa/archives/gnu/archive-contents
	dist/elpa/archives/marmalade/archive-contents
	dist/elpa/archives/melpa/archive-contents
	user.el