Centos6

We need to merge in this testing branch into master soon, as its starting to get confusing. Please review the changes and ensure the courseware will not be affected.