Consolidated formatting for artist and album names

In particular, translated &amp; to actual ampersands
Added json consolidator.  Some cleanup

Need to combine the fileconsolidator and filetocsvtranslator classes.