update diff

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
Merge branch 'master' into patch-deb-updation
Merge pull request #157 from battlemidget/patch-deb-updation

Make debian packaging 'non-native'