Merge pull request #128 from chsticksel/develop

Extensions to Lustre input
Add camlp4 to the requirements