Backport #196 to the 3.1-stable branch

Conflicts:

	docs/source/index.rst
	setup.cfg
	setup.py

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.0-stable@2086 ed100bfc-0583-0410-97f2-c26b58777a21