Merge pull request #6 from garrettw/master

Simplified timer code, added toggle for pending functionality, etc.
Moving some code
Doing some improvements
Doing some minor tweaks
Undoing my change to priorities

The higher the priority an event is, then it should be called over
precedence
merged upstream changes and made a few fixes/tweaks