update
merged
added org-latex-class and other minor changes
Merge branch 'master' of http://github.com/cpaulik/emacsconfig

Conflicts:
	config/indi_config.el