Merge2head

This branch contains the mic development that is ready to be merged with the main code.
This code works on miclogin and on my mac.  The main development branch is called mic.

Alec