CDH5 configuration optimizations and tweaks
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from cpenner461/master

CDH5 configuration optimizations and tweaks