Update emacs for working with LaTeX and java
Merge branch 'master' of github.com:npnth/config-files

Conflicts:
	emacs/.emacs