changed next_state to account for state flow
updated failing test to account for change
fixed type for district form
Merge branch 'feature/issue-85-so-that-I-can-communicate-to-all-district-staff-as-a-RTS-staff-role-I-can-send-sms' into feature/issue-90-refactor-send-to-sms-zones-code-to-fix-known-bugs

Conflicts:
	sms/admin.py
Merge pull request #87 from praekelt/feature/issue-87-add-question-asking-about-total-boys-and-girls-to-ussd-registration

add question asking about total boys and girls to ussd registration
Merge pull request #86 from praekelt/feature/issue-86-add-total-boys-and-total-girls-fields-to-SchoolData

add total boys and total girls fields to SchoolData
Update travis to use wheel (again) after git resets - thanks @jerith (again)
Merge branch 'feature/issue-90-refactor-send-to-sms-zones-code-to-fix-known-bugs' into develop
Merge branch 'feature/issue-88-add-update-school-registration-data-to-the-USSD-menu' into develop
Merge branch 'develop' into feature/issue-91-add-district-admin-USSD-reporting-functionality