Hydrogen storage in single-walled carbon nanotube bundles and peapods