d-5 commit from eubene, bit of cleanup done, artist.rb needs fixes for when artist does not exist