Make FileContainer accept the same args as get_readable_fileobj
Merge pull request #261 from loicseguin/filecontainer-timeout

Make FileContainer accept the same args as get_readable_fileobj
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
Handle timeout exceptions in FileContainer
Better catch the exception where it actually occurs
Merge branch 'handle-timeout' into sdss-timeout
Merge pull request #262 from loicseguin/handle-timeout

Handle timeout in FileContainer
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