added search test, merged project tests, need to clean up some more
cleaned up project test
Merge branch 'master' of github.com:kencochrane/scorinator

Conflicts:
	scorinator/core/tests/models.py