changed path for settings

gerbil branch created
minor
nothing major
updated gitignore
cleaning up to merge
cleaning
updated gitignore
cleaned up git stuff (wasn't merged with sjs_working branch)
synchronizing files
Merge branch 'master' of https://github.com/TytoLogy/NICal

Conflicts:
	NICal.m
some changes to processTriggeredData by rosenlab
working on having spectrogram plotted
added spectrogram display.
nothing major, testing