Modifying jenkins Makefile so it no longer needs an extra 'acl2-devel' directory.  Also, adding the other 5 combinations of features.