Add query_specobj and query_photoobj
Add tests for query_specobj and query_photoobj
Add timeout for query_region
Make FileContainer accept the same args as get_readable_fileobj
Add optional timeout argument to SDSS methods
Merge branch 'master' into sdss-timeout
Use send_request for proper handling of timeout errors
Merge branch 'handle-timeout' into sdss-timeout
Add tests for timeouts
Merge branch 'master' into sdss-timeout
Merge branch 'sdss-timeout' into sdss-more-queries

Conflicts:
	astroquery/sdss/tests/test_sdss.py
	astroquery/sdss/tests/test_sdss_remote.py
Add timeout argument to query_specobj and query_photoobj
Fix tests for Python 2.6
Merge pull request #263 from loicseguin/sdss-timeout

SDSS Timeouts
Merge branch 'master' into sdss-more-queries
PEP 8
Add tests for correctness
Merge pull request #264 from loicseguin/sdss-more-queries

Add two more query methods to SDSS
fix vizier doc bugs