Rename Email_Message to EmailMessage
Merge branch 'master' into simple_api

Conflicts:
	cybox/objects/win_task_object.py
Fix docstrings