Adding a sample Factory Boy test
remove errant file
Merge branch 'master' of github.com:rapidsms/rapidsms.org into feature/23-user-avatar

Conflicts:
	requirements/base.txt