Drive-by: be ready for GCC 4.10.
[fnal-cpp0x] Merge branch 'localcdcvs'

Merge in upstream FNAL master branch to get latest features and fixes
Document pull/merge of upstream FNAL branch to github