Another step in the right direction

change code to work in python2.6 env and with fabric; 
update tests
That's a lot of spaces. :game_die: