cleaned up git stuff (wasn't merged with sjs_working branch)
Merge branch 'master' of https://github.com/TytoLogy/NICal into sjs_working

Conflicts:
	NICal.m