Various other cleanups
Merge branch 'master' of github.com:UWMLI/ARISRealTimeMonitor