removed conflicting gems
Merge pull request #14 from sgray11/remove_conflicting_gems

removed conflicting gems