Fixed merge annotations bug
Merge of master, kl-dev, and rbdevel that pass unit tests.

Merge branch 'master' into rbdevel-master-merge

Conflicts:
	ocpca/annindex.py
	ocpca/ocpcadb.py
	ocpca/ocpcarest.py
Closing all tmpfiles except those that get returned to django.