Reorganize files a bit. Remove a couple unused files.
Merge branch 'master' of https://github.com/jamestunnell/musicality

Conflicts:
	lib/musicality.rb