Merge branch 'master' into include-file-path-only

.travis.yml

@@ -3,6 +3,8 @@ language: cpp
 os:
   - linux
 
+dist: trusty
+
 compiler: 
      - gcc
     #- clang
@@ -14,22 +16,26 @@ branches:
 
 
 before_install: 
-   # use http://lint.travis-ci.org/ to validate changes
-       # sudo add-apt-repository -y ppa:h-rayflood/llvm; 
-       # sudo apt-get install --allow-unauthenticated -qq clang-3.4
 
    if [ ${TRAVIS_OS_NAME} = 'linux' ]; 
    then 
+
+
      sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; 
+
+     sudo add-apt-repository -y ppa:george-edison55/precise-backports;
+
+     sudo apt-get remove -qq cmake cmake-data
+     sudo apt-get autoremove -qq
+
      sudo apt-get update -qq;
      sudo apt-get install python-software-properties;
      sudo apt-get update;
      sudo apt-get install gcc-5 g++-5;
      sudo apt-get install software-properties-common;
-     sudo add-apt-repository -y ppa:george-edison55/cmake-3.x;
      sudo apt-get update;
      sudo apt-get update -qq;
-     sudo apt-get install cmake;
+     sudo apt-get install cmake cmake-data;
    fi
  
 install:
@@ -57,4 +63,6 @@ install:
   - echo $PWD
  
 script: "./scripts/buildAndRunTests.sh"
+
+