refactored timers

src/sip/dynamic_data/mpi_state.h  fixed typo in comment
src/sip/static_data/sip_tables.cpp   simplified max_timer_slot
src/sip/static_data/sip_tables.h
      removed sialx_lines_, updated comment
src/sip/worker/interpreter.cpp
      refactored to eliminate two calls to timer_trace
        for each instruction
      moved block wait time start and pause to check_and_wait
         to sial_ops.  Only needed in parallel
      should work with NULL sialx_timer_ but this hasn't been
         tested.
       modified:   src/sip/worker/interpreter.h
      comments fixed up, renamed last_seen_line to timer_line
       modified:   src/sip/worker/sial_ops_parallel.cpp
	constructor takes SialxTimer object,
     get_block_for_reading takes sial line number,
	   and records wait time in wait_and_check
       modified:   src/sip/worker/sial_ops_parallel.h
     changes necessary to match changes in
      src/sip/worker/sial_ops_parallel.cpp
       modified:   src/sip/worker/sial_ops_sequential.cpp
      minor changes to match interface of sial_ops_parallel
       modified:   src/sip/worker/sial_ops_sequential.h
       minor changes to match interface of sial_ops_parallel
       modified:   src/sip/worker/sialx_timer.cpp
        added parameter std::ostream& out,
         default value is std::cout
       modified:   src/sip/worker/sialx_timer.h
       modified:   test/test_controller_parallel.cpp
         added members
           sip::SialxTimer* sialx_timers_;
           sip::ServerTimer* server_timer_;
           print_timer();
       modified:   test/test_controller_parallel.h
       modified:   test/test_qm.cpp
            cleaned up
        mofified:  test/test_sial.cpp
fixed merge conflicts with master