Merge pull request #616 from mmcguinn/master

-Backported fixed map colors from rSENSE.
-Backport of elapsed time interface changes.