setup for MJRosen lab rig
minor changes in NIcal settings
tweaked config
new user, labuser
updated gitignore
updates
new protocols, labuser things, !
Merge branch 'gerbil' of https://github.com/TytoLogy/TytoLogySettings

Conflicts:
	sshanbhag/NICal/NICal_Defaults.mat
	sshanbhag/tytopaths.m