Consolidated update & kill methods

updateTimer methods and killTimer methods have been consolidated into
one method. This should help prevent errors and increase program
efficiency.

Also fixed a bug where timers would not kill themselves when they
reached their end time. (Issue #20)