Merge branch 'verbose_tablewrite_exception'

Conflicts:

	astropy/io/registry.py
Fix accidentally inacurrate doctest string--didn't catch this before since the 0.2.x branch doesn't run doctests.