Fix test framework by not parsing website arguments when running inside nosetests
Merge branch 'master' of git://github.com/rfurman/lmfdb into quickmerge
Remove debug lines
Fixing the failing tests
Merge branch 'master' of git://github.com/lemurell/lmfdb into quickmerge
Removed testing.py. Changed to unittest2.

nosetests was running the file testing.py, which was causing weird
errors and confusion, so I got rid of it. Also, I changed all
occurrences of unittest to unittest2.
Merge branch 'master' of github.com:LMFDB/lmfdb into quickmerge