Another rebase to also adapt the new CentOS travis target. This rebase includes the changes proposed by Dmitry and Mike. I have not change the 'cp' to create 'crit' to a 'ln' because I have no preference on what is better. Adrian