cleaning up
Merge branch 'installed' of https://github.com/TytoLogy/NICal into installed

Conflicts:
	NICal_EventLogs.mat
	processTriggeredDataRMSMjR.m
Merge branch 'sjs_working' of https://github.com/TytoLogy/NICal into sjs_working