Another step in the right direction

change code to work in python2.6 env and with fabric; 
update tests
With Shashank :walking: , I'm the biggest :octopus: in this pond