removing note_field and desc from Note model. closes #229
resolving erroneous merge conflict of search.py