NotImplementedError messages updated
Merge branch 'niedoc' of https://github.com/ilam/pandas into niedoc

Conflicts:
	pandas/core/generic.py