switch to py 2.6
Merge branch 'master' into ministatcounterbranch