added calories and ave heart rate to Activity. cleaned up cruft in
createactivity.