don't run doctests with -t option
Merge pull request #2004 from eteq/test-path-no-doctests

don't run doctests when -t option given
Merge pull request #2006 from astrofrog/update-six

Update bundled six to 1.5.2
`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.
Completed the set of test for classes instatiation. SAMP Hub start/stop test added. Clients communication test added.
First implementation of an alternative Web Profile "popup" message for incoming registrations in case of missing Tkinter.
Useless cross_domain limitation to http protocol removed
Import `sampy` changed to import `astropy.vo.samp` in order to avoid the doctest errors.
Missing reference to the package fixed, and some `print` made compliant with Python 3