- Move mergeDates into SongItem and a bunch of cleanup

Change-Id: Idd2ef4e26038fda7749df2015ed34c3566ae2323