Ready for initial 1.6 packaging

Have got it completely ready for 1.6 packaging, now just to fix the
reobfuscated bugs and we should be fine :)