upgrade tests local mode
pep8 fixes
pep8 fix
use local upgrade if specified
Merge branch 'master' into upgrade_local_mode

Conflicts:
	upgrade_through_versions_test.py
Merge pull request #74 from riptano/upgrade_local_mode

allow running upgrade tests from local C* source