added utility function urljoin_keep_path
use six library for Py3 compatibility
adjusted documentation for utils.url_helpers.urljoin_keep_path to latest changes
break lines after 74 chars in docstring
Merge branch 'master' of github.com:astropy/astroquery into urlutil
Merge pull request #373 from derdon/urlutil

added utility function urljoin_keep_path