Rebases Centos6 Against Master

Went through and rebased the centos6 branch against the master branch.