cassandra 1.2.16

Closes #390.
Closes #394.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>