astropy/astropy — pull request #129 by jiffyclub (2012-01-13 22:08:56+00:00)
Title: Move the py.test conftest.py file

Moved the conftest.py file one directory level up in the to the astropy directory so that it gets installed with the rest of astropy. Changed the import of plugins accordingly. See #128.

Also updated the .gitignore file so it ignores the Mac OS X .DS_Store file.