Don't strip trailing _ in column names

Fixes PYTHON-56:
Merge branch '1.x'

Conflicts:
	CHANGELOG.rst
	cassandra/decoder.py