Merge pull request #215 from Takishipp/s_type_cleanup

s_type cleanup

diff --cc src/instr/instr_config.cpp
Simple merge

diff --cc src/instr/instr_interface.cpp
Simple merge

diff --cc src/instr/instr_paje_trace.cpp
Simple merge

diff --cc src/msg/msg_vm.cpp
Simple merge

diff --cc src/smpi/internals/instr_smpi.cpp
Simple merge

diff --cc src/surf/instr_routing.cpp
Simple merge