Ignore differences between 32-bit and 64-bit ints
Merge branch 'v0.3.x' of github.com:astropy/astropy into v0.3.x

Conflicts:
	astropy/tests/pytest_plugins.py