fixed '__str__ returned non-string'
Bump to 0.4.2
Merge remote-tracking branch 'upstream/master' into use_builtin_enums

Conflicts:
	enumfields/enums.py