diff --git a/.travis.yml b/.travis.yml
index fe56521..021066d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,53 +1,29 @@
-
-env:
-  global:
-    - CONAN_USERNAME="nigels-com"
-    - CONAN_REFERENCE="glew/master"
-    - CONAN_CHANNEL="testing"
-
-linux: &linux
-   os: linux
-   sudo: required
-   language: python
-   python: "2.7"
-   services:
-     - docker
-osx: &osx
-   os: osx
-   language: generic
-matrix:
-   include:
-
-      - <<: *linux
-        env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=lasote/conangcc49
-      - <<: *linux
-        env: CONAN_GCC_VERSIONS=5.4 CONAN_DOCKER_IMAGE=lasote/conangcc54
-      - <<: *linux
-        env: CONAN_GCC_VERSIONS=6.3 CONAN_DOCKER_IMAGE=lasote/conangcc63
-      - <<: *linux
-        env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39
-      - <<: *linux
-        env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=lasote/conanclang40
-      - <<: *osx
-        osx_image: xcode7.3
-        env: CONAN_APPLE_CLANG_VERSIONS=7.3
-      - <<: *osx
-        osx_image: xcode8.2
-        env: CONAN_APPLE_CLANG_VERSIONS=8.0
-      - <<: *osx
-        osx_image: xcode8.3
-        env: CONAN_APPLE_CLANG_VERSIONS=8.1
-        
+language: cpp
+sudo: false
 install:
-  - chmod +x ./build/conan/.travis/install.sh
-  - ./build/conan/.travis/install.sh
 script:
-  # Building master
-  - cp -rf ./build/conan/* .
-  - cp -rf ./build/conan/.travis .
-  - chmod +x .travis/run.sh
-  - .travis/run.sh
-
-  # Building released version
-  #- chmod +x ./build/conan/.travis/run.sh
-  #- cd ./build/conan && .travis/run.sh
+- make -C auto clobber
+- make extensions
+- make dist-src
+- make clean; SYSTEM=linux            make 
+- make clean; SYSTEM=linux-osmesa     make
+- make clean; SYSTEM=linux-egl        make
+- make clean; SYSTEM=linux-clang      make 
+- make clean; SYSTEM=linux-clang-egl  make 
+- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' .                 ; make; popd
+- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . ; make; popd
+- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_EGL=1 .    ; make; popd
+addons:
+  apt:
+    packages:
+    - git
+    - cmake
+    - dos2unix
+    - libosmesa6-dev
+    - libegl1-mesa-dev
+  artifacts:
+    bucket: glew
+    s3_region: "us-east-1"
+    paths:
+    - $(ls *.zip *.tgz | tr "\n" ":")
+    - $(find doc -type f | tr "\n" ":")
diff --git a/.travis.yml.conan b/.travis.yml.conan
new file mode 100644
index 0000000..fe56521
--- /dev/null
+++ b/.travis.yml.conan
@@ -0,0 +1,53 @@
+
+env:
+  global:
+    - CONAN_USERNAME="nigels-com"
+    - CONAN_REFERENCE="glew/master"
+    - CONAN_CHANNEL="testing"
+
+linux: &linux
+   os: linux
+   sudo: required
+   language: python
+   python: "2.7"
+   services:
+     - docker
+osx: &osx
+   os: osx
+   language: generic
+matrix:
+   include:
+
+      - <<: *linux
+        env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=lasote/conangcc49
+      - <<: *linux
+        env: CONAN_GCC_VERSIONS=5.4 CONAN_DOCKER_IMAGE=lasote/conangcc54
+      - <<: *linux
+        env: CONAN_GCC_VERSIONS=6.3 CONAN_DOCKER_IMAGE=lasote/conangcc63
+      - <<: *linux
+        env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39
+      - <<: *linux
+        env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=lasote/conanclang40
+      - <<: *osx
+        osx_image: xcode7.3
+        env: CONAN_APPLE_CLANG_VERSIONS=7.3
+      - <<: *osx
+        osx_image: xcode8.2
+        env: CONAN_APPLE_CLANG_VERSIONS=8.0
+      - <<: *osx
+        osx_image: xcode8.3
+        env: CONAN_APPLE_CLANG_VERSIONS=8.1
+        
+install:
+  - chmod +x ./build/conan/.travis/install.sh
+  - ./build/conan/.travis/install.sh
+script:
+  # Building master
+  - cp -rf ./build/conan/* .
+  - cp -rf ./build/conan/.travis .
+  - chmod +x .travis/run.sh
+  - .travis/run.sh
+
+  # Building released version
+  #- chmod +x ./build/conan/.travis/run.sh
+  #- cd ./build/conan && .travis/run.sh
diff --git a/.travis.yml.main b/.travis.yml.main
deleted file mode 100644
index 021066d..0000000
--- a/.travis.yml.main
+++ /dev/null
@@ -1,29 +0,0 @@
-language: cpp
-sudo: false
-install:
-script:
-- make -C auto clobber
-- make extensions
-- make dist-src
-- make clean; SYSTEM=linux            make 
-- make clean; SYSTEM=linux-osmesa     make
-- make clean; SYSTEM=linux-egl        make
-- make clean; SYSTEM=linux-clang      make 
-- make clean; SYSTEM=linux-clang-egl  make 
-- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' .                 ; make; popd
-- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_OSMESA=1 . ; make; popd
-- pushd build/cmake; git clean -xdf .; cmake -G 'Unix Makefiles' -DGLEW_EGL=1 .    ; make; popd
-addons:
-  apt:
-    packages:
-    - git
-    - cmake
-    - dos2unix
-    - libosmesa6-dev
-    - libegl1-mesa-dev
-  artifacts:
-    bucket: glew
-    s3_region: "us-east-1"
-    paths:
-    - $(ls *.zip *.tgz | tr "\n" ":")
-    - $(find doc -type f | tr "\n" ":")