On branch master:
-Fix bug where switching languages did not overwrite previous language data
-Clean up code
Changes to be committed:
	modified:   src/editor.cpp
	modified:   src/syntaxhighlighter.cpp
	modified:   src/syntaxhighlighter.h
On branch master:
-Add and modify language files
-Change some default highlighting colors
Changes to be committed:
	modified:   languages/c.xml
	modified:   languages/cplusplus.xml
	new file:   languages/octave_matlab.xml
	modified:   languages/python.xml
	modified:   styles/default.xml