Merge pull request #34 from jhesketh/master

Work around virtualenv versions for now
Horrible hack to get latest virtualenv
Merge branch 'master' of github.com:rcbau/puppet
Fix puppet deps