Merge branch 'refs/heads/master' into dev-blackboard-import

Merging master branch into dev-blackboard-import to bring the dev branch up-to-date so I can clean up a few things.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Deprecated exitOnError()

I build myself a much better error display function a while back, but hadn't replaced all the calls to exitOnError() with it. Now I have, and I have removed exitOnError().

Also: .gitignore has been updated to reflect the presence of .orig merge files scattered throughout the directory. Eventually they should get cleaned up. But, meanwhile, no need to commit them to the repo.
Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-blackboard-import'
Merge branch 'refs/heads/master' into dev-calendar-ics

Updating dev-calendar-ics to reflect current master.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>