Fixed bugs introduced by code clean-up; h5py now from PyPI.