Fix typo in version.c
Basic fixes to jlibtool which are unlikely to break anything
Use consistent ordering of types (mirrors enum)

Add vp_short and vp_byte (saves on masking)
Merge remote-tracking branch 'upstream/master'