Fixed the Timer template.

Before, some operations were hard coded to use the
std::chrono::high_resolution clock. Now, they use the ClockType template
parameter for those operations.
Merge branch 'master' into SDL2-port