Get the package name right...
Tidy up Makefile and package building
Fix #5

Yup, it's another dirty hack and unfortunately one that'll eventually
need removing from both the top of the module and further within it.
Remove duplicated rule

How did that get there?!