Fix line splitting in test to make it work properly on Windows
Use splitlines instead of split('\n') where appropriate
Merge pull request #25 from mdboom/misc/splitlines

Use splitlines instead of split('\n') where appropriate
Fix string -> bytes for Windows testing
Clarified distinction between running tests in source code vs. installed version

closes #795
adjusted wording on astropy.test() to "may not work"
change set width to maximum width
Prevent downloading a file twice when identifying and reading it through the registry system.
Add more system/dependency information to py.test output
Add Table.join method
New files for table join
Change to more general way of creating unique column names in join
Initial implementation of metadata merging
Use a mapping from new col names back to originals in join
Add code to merge column and table meta data
Apply the mask for input masked arrays
Fix problem for zero-length input tables
Rename cyjoin.pyx to _np_utils.pyx
Add Planck 2013 cosmology

* Add Planck2013 cosmology object.  Not the default because
  not yet published.  More Planck results are not expected until
  2014, so hopefully the name is safe.
* Mention Planck2013 object in documentation.
* Add very minor unit test for Planck2013.
Stricter simulation of a with statement