Some trivial - and some not so trivial! - changes which take advantage of C++11... See merge request !7