diff --git a/.travis.yml b/.travis.yml
index 89da1148e9..fa4e5cab98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,14 @@ language: cpp
 compiler:
     - gcc
 
-script: mkdir build && cd build && cmake .. && ctest -V
+script:
+    - mkdir build
+    - cd build
+    - cmake ..
+    - ctest -V
 
 os:
     - linux
     - osx
+
+#  vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : 
diff --git a/matrix/Dcm.hpp b/matrix/Dcm.hpp
index e13a84931c..05bcdcb37e 100644
--- a/matrix/Dcm.hpp
+++ b/matrix/Dcm.hpp
@@ -77,3 +77,5 @@ public:
 typedef Dcm<float> Dcmf;
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/matrix/Euler.hpp b/matrix/Euler.hpp
index 9b356ca265..a6701a9cec 100644
--- a/matrix/Euler.hpp
+++ b/matrix/Euler.hpp
@@ -88,3 +88,5 @@ public:
 typedef Euler<float> Eulerf;
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/matrix/Matrix.hpp b/matrix/Matrix.hpp
index e0cbe8f599..86fe51d1af 100644
--- a/matrix/Matrix.hpp
+++ b/matrix/Matrix.hpp
@@ -453,3 +453,5 @@ public:
 typedef Matrix<float, 3, 3> Matrix3f;
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/matrix/Quaternion.hpp b/matrix/Quaternion.hpp
index 938c071caa..d36c25e81d 100644
--- a/matrix/Quaternion.hpp
+++ b/matrix/Quaternion.hpp
@@ -109,3 +109,5 @@ public:
 typedef Quaternion<float> Quatf;
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/matrix/Scalar.hpp b/matrix/Scalar.hpp
index f45e0c374a..fdf2df6fb8 100644
--- a/matrix/Scalar.hpp
+++ b/matrix/Scalar.hpp
@@ -44,3 +44,5 @@ public:
 typedef Scalar<float> Scalarf;
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/matrix/Vector.hpp b/matrix/Vector.hpp
index 4844b6c6e9..7bd792ef1e 100644
--- a/matrix/Vector.hpp
+++ b/matrix/Vector.hpp
@@ -50,3 +50,5 @@ public:
 };
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/matrix/Vector3.hpp b/matrix/Vector3.hpp
index 4fb1c0f2f7..8f667f90a7 100644
--- a/matrix/Vector3.hpp
+++ b/matrix/Vector3.hpp
@@ -45,3 +45,5 @@ public:
 typedef Vector3<float> Vector3f;
 
 }; // namespace matrix
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/dcm.cpp b/test/dcm.cpp
index 8f404226f6..2779d46113 100644
--- a/test/dcm.cpp
+++ b/test/dcm.cpp
@@ -11,3 +11,5 @@ int main()
     Eulerf e = Eulerf(dcm);
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/euler.cpp b/test/euler.cpp
index cafa05d67f..236f6e0225 100644
--- a/test/euler.cpp
+++ b/test/euler.cpp
@@ -16,3 +16,5 @@ int main()
     (void)n;
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/inverse.cpp b/test/inverse.cpp
index 67b4569347..9fb23fdefa 100644
--- a/test/inverse.cpp
+++ b/test/inverse.cpp
@@ -15,16 +15,18 @@ int main()
     assert(A_I == A_I_check);
 
     // stess test
-    static const size_t n = 100;
+    static const size_t n = 50;
     Matrix<float, n, n> A_large;
     A_large.setIdentity();
     Matrix<float, n, n> A_large_I;
     A_large_I.setZero();
 
-    for (size_t i = 0; i < 100; i++) {
+    for (size_t i = 0; i < 50; i++) {
         A_large_I = A_large.inverse();
         assert(A_large == A_large_I);
     }
 
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/matrixAssignment.cpp b/test/matrixAssignment.cpp
index 21827883bd..dfd98e0ae3 100644
--- a/test/matrixAssignment.cpp
+++ b/test/matrixAssignment.cpp
@@ -27,3 +27,5 @@ int main()
 
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/matrixMult.cpp b/test/matrixMult.cpp
index 0dfd05f875..0af96180c6 100644
--- a/test/matrixMult.cpp
+++ b/test/matrixMult.cpp
@@ -24,3 +24,5 @@ int main()
     assert(R2 == I);
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/matrixScalarMult.cpp b/test/matrixScalarMult.cpp
index 6c569d6ed0..c0b8932604 100644
--- a/test/matrixScalarMult.cpp
+++ b/test/matrixScalarMult.cpp
@@ -9,10 +9,12 @@ int main()
     float data[9] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
     Matrix3f A(data);
     A = A * 2;
-    //float data_check[9] = {2, 4, 6, 8, 10, 12, 14, 16, 18};
-    //Matrix3f A_check(data_check);
-    //A.print();
-    //A_check.print();
-    //assert(A == A_check);
+    float data_check[9] = {2, 4, 6, 8, 10, 12, 14, 16, 18};
+    Matrix3f A_check(data_check);
+    A.print();
+    A_check.print();
+    assert(A == A_check);
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/quaternion.cpp b/test/quaternion.cpp
index afba53576d..89c0db2063 100644
--- a/test/quaternion.cpp
+++ b/test/quaternion.cpp
@@ -7,10 +7,10 @@ using namespace matrix;
 int main()
 {
     Quatf p(1, 2, 3, 4);
-	assert(p(0) == 1);
-	assert(p(1) == 2);
-	assert(p(2) == 3);
-	assert(p(3) == 100);
+    assert(p(0) == 1);
+    assert(p(1) == 2);
+    assert(p(2) == 3);
+    assert(p(3) == 4);
 
     Quatf q(0, 1, 0, 0);
     Quatf r = p*q;
@@ -18,3 +18,5 @@ int main()
     Eulerf e = Eulerf(p);
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/setIdentity.cpp b/test/setIdentity.cpp
index 15ecf356a3..0ece759bee 100644
--- a/test/setIdentity.cpp
+++ b/test/setIdentity.cpp
@@ -21,3 +21,5 @@ int main()
 
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/transpose.cpp b/test/transpose.cpp
index eed53bc080..7dd7f2339d 100644
--- a/test/transpose.cpp
+++ b/test/transpose.cpp
@@ -16,3 +16,5 @@ int main()
     assert(A_T == A_T_check);
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/vector.cpp b/test/vector.cpp
index 60ba11aa7d..a1aabc6a26 100644
--- a/test/vector.cpp
+++ b/test/vector.cpp
@@ -13,3 +13,5 @@ int main()
     (void)r;
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/vector3.cpp b/test/vector3.cpp
index 1a3a1bbf66..fe93629e3b 100644
--- a/test/vector3.cpp
+++ b/test/vector3.cpp
@@ -11,3 +11,5 @@ int main()
     Vector3f c = a.cross(b);
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */
diff --git a/test/vectorAssignment.cpp b/test/vectorAssignment.cpp
index fdd715bc12..e5074583dd 100644
--- a/test/vectorAssignment.cpp
+++ b/test/vectorAssignment.cpp
@@ -26,3 +26,5 @@ int main()
 
     return 0;
 }
+
+/* vim: set et fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : */