changed path for settings

gerbil branch created
minor
Merge remote-tracking branch 'origin/working'
some fixes to processTriggeredData
updated gitignore
cleaning up to merge
cleaning
updated gitignore
Merge branch 'sjs_working' of https://github.com/TytoLogy/NICal into sjs_working