Updating files in an attempt to get travis building with g++4.9 on the ancient ubuntu 12.04