Rewrote timer

It is now based on the high resolution performance counter.
Merged master into this branch
Adjusted speeds to go with the new timer
Merge remote-tracking branch 'origin/master' into NewTimer
Merged new timer with master