python mode local stuff?
fix merge conflict
set C++ style to linux for working on Mutiny
add el files for new modes and themes
add theme stuff and some cleanup
fix merge