Code style cleanups, plus additional timing changes
Merge branch 'master' of git:jasonkuster/MetroLooper