Merge pull request #471 from frank-dittrich/bleeding-jumbo

Improve valid() for openssl-enc, fixing #498
Build ../run/luks2john (luks2john.c and Makefile fixed)

luks2john.c had mixed code and declarations
Makefile didn't have a build target for ../run/luks2john