Modify Makefile in preparation for switching from g++ to clang++.

Don't actually switch yet, as there is a problem with the pstreams
version in ubuntu and clang.

https://bugs.launchpad.net/ubuntu/+source/pstreams/+bug/1264341

Fix a syntax error in series_collection.h.