Added first pass of timer.
Merge branch 'master' of http://github.com/rabidaudio/hawkshin