Fixes for Travis and Launchpad
Merge branch 'master' of https://github.com/Nocte-/hexahedra