Merge branch 'master' of git://github.com/h5py/h5py

Conflicts:
	h5py/api_functions.txt
	h5py/api_gen.py