Preparing release 3.1.6


Conflicts:

	CHANGES.txt
	docs/source/conf.py
	setup.cfg

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