Add query_specobj and query_photoobj
Add tests for query_specobj and query_photoobj
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
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