crudely merge mdaEPiano and mdaPiano

There are some differences in the types of certain variables that don't
seem very important.  This will be addressed in future commits.