Refactor and remove unnecessary calls
Merge branch 'master' of git://github.com/unicefuganda/rapidsms-edtrac

Conflicts:
	education/views.py