Fix print_code_line to respect the UNICODE_OUTPUT configuration variable.
Update test for non-unicode data
Fixes issue 1912
Resolved a rebasing conflict in CHANGES.rst
Added regression test for issue #1912
Merge pull request #1912 from barentsen/fix-issue-1912

WCS.footprint_to_file() is broken
Merge pull request #2002 from mdboom/vo/volint-unicode

Encoding error when using volint
Merge pull request #2017 from astrofrog/fix-argparse-31

astropy.utils.compat.argparse not working for Python 3.1
`SAMPy` code added within `astropy.vo.samp` package, and `sampy` script added with `scripts`
Add astropy license line to sampy files
Add docstring to `vo` and `vo.samp` packages
Fix imports in `vo/samp/__init__.py`
Remove unused imports in sampy
Remove vo.cfg
Add first unit test for vo.samp
Add docs/vo/samp/index.rst file
Fix except statement in vo.samp.core
Removed the GPL license and the automatic Subversion keywords
Modified exceptions format in order to follow the Astropy style guide. Modified the print statement too.
Code modified in order to support Python 3.