Miscellaneous revisions
Refactor
Merge branch 'master' of https://github.com/hlmason/musiclaps2 into walkthrough