Fixed conflicted ruby binaries
Merge branch 'master' of github.com:crowdpublishtv/teamawesome