Add package target to create Marmalade package
Re-order goals and rules