Some clean up work to help get the package into Debian

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Signed-off-by: Antoine Musso <hashar@free.fr>

Change-Id: I7c19e422456e39e6dc196297726fbb1f503b33c6