assert_equal ouputs red instead of <>
Merge branch 'assertion_output' of https://github.com/att14/Testify into assertion_output

Conflicts:
	testify/utils/stringdiffer.py
option is called disable_color not no_color