Update master
Merge branch 'master' of git://github.com/cajun/voodoo
upgrading
Merge branch 'master' of git://github.com/cajun/voodoo
Merge branch 'master' of git://github.com/cajun/voodoo