Merge upstream changes as of 28/01/2014

Copy in updates from cetlib @30c87f17ebf190f56f9528b271374cc96e195ea5

- Protect use of std::map emplace method in registry_via_id as this
  is not supported in GCC < 4.8.
- Remove no longer present art/ unit tests.

Copy in updates from fhiclcpp @ac34b3a26fda8ce77913ecb149140ca619a2b2fc