More cleanup
Merge branch 'will' of github.com:Merglyn/tiltmusic into will