Another step in the right direction

change code to work in python2.6 env and with fabric; 
update tests
Blame pep8, lazy as I am I wouldn't add anything myself