Stringstream to ostringstream tidy up
Resync with trunk
Standardise the C++ copyright messages
Standardise the Python copyright messages
Merge pull request #391 from peternewman/trivial-fixes

Tidy up various minor things that appear lots of times throughout the codebase.