Uncommented perf2 conversion.
Merge branch 'v6-lsp'
Revert "Merge branch 'v6-lsp'"

This reverts commit 807de22e15731a6b353bdab7fb65ca2f2177e440, reversing
changes made to 12ebb0b0bd753d9db9843b1835bd9a40949da533.
Small fixes to data conversion scripts.
Merge branch 'master' of https://github.com/yeastgenome/SGDBackend
Merge branch 'master' into fixing-v60bugs

Conflicts:
	src/sgd/convert/convert_dev.py
	src/sgd/convert/from_bud/evelements.py
	src/sgd/convert/from_bud/reference.py
	src/sgd/model/nex/bioentity.py
	src/sgd/model/nex/evidence.py
Cleaning up after merging and fixing tests.