Fix log detection post-5187
Merge pull request #68 from driftx/master

Update up/down detection
Merge branch 'master' of github.com:pcmanus/ccm

Conflicts:
	ccmlib/node.py
Fix setting vnodes when using the populate command
use /usr/bin/env to invoke python
Merge pull request #70 from al3xandru/envpython

use /usr/bin/env to invoke python
add support for logback when ccm is used with cassandra version 2.1+ due to CASSANDRA-5583
Merge pull request #74 from mkjellman/master

add support for logback and C* 2.1+ due to CASSANDRA-5583
Add support for cassandra-shuffle
Merge pull request #75 from danielrmeyer/shuffle

Add support for cassandra-shuffle
Fix args for nodetool