Basic debianisation
Fix debian/rules file
Merge remote-tracking branch 'vi/master'