simplify user notifications - make them on/off

I think we can probably get away with simply allowing users to turn notifications on or off. This will simplify the code and make the system more usable, I think. Snuck in a bug fix as well.