more edits
Merge branch 'master' of github.com:weheartit/cassandra-at-whi