No more make_message_options().
Remove user_api.msg_options().
Merge branch 'feature/issue-471-remove-make_message_options' into develop
Backport some changes from develop-frontend.
Merge branch 'develop' into develop-frontend

Conflicts:
	go/apps/bulk_message/tests/test_new_views.py
	go/apps/bulk_message/tests/test_views.py
	go/apps/sequential_send/tests/test_views.py
	go/apps/subscription/tests/test_views.py
	go/apps/surveys/tests/test_new_views.py
	go/apps/surveys/tests/test_views.py
	go/conversation/base.py
	go/conversation/conversation_views.py
	go/vumitools/conversation/utils.py