Fixed to_cnf/to_dnf simplification
Changed parameter name, fixed tests
Renamed bool_equal to bool_map
Merge pull request #2559 from srjoglekar246/tochf

Polishing off simplify_logic, bool_equal and simplification
Merge branch 'master' into logic

Conflicts:
	sympy/logic/__init__.py
	sympy/logic/boolalg.py
	sympy/logic/tests/test_boolalg.py