change code to work in python2.6 env and with fabric; update tests
Merge pull request #31 from fna/master

Another step in the right direction