Changes to the way string formatting is done.
Merge branch 'amg/table-format-alignment' of https://github.com/agroener/astropy into amg/table-format-alignment

Conflicts:
	astropy/table/pprint.py