Fix buggy centos6 build
Merge branch 'master' of github.com:ponyisi/cloud-tier-3