changed Battery.initialize() function to allow both Battery.initialize_energy() and Battery.initialize_mass() depending on what's specified, added aluminum air battery
deleted some debug statements left in takeoff and landing lengths