fix the setup
Merge branch 'dev' of git://github.com/pculture/unisubs into dev