diff --git a/.gitignore b/.gitignore
index 35c39c33..c35fcb6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ Gemfile.lock
 
 # Build artifacts
 build/
+
+#vim swap files
+*.swp
diff --git a/.travis.yml b/.travis.yml
index 38b78c63..cd7b690d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,21 @@
 language: cpp
+os:
+  - osx
+  - linux
 sudo: required
 dist: trusty
 compiler:
   - clang
   - gcc
 env:
-  matrix:
-    - GMOCK_VER=1.7.0 
-    - GMOCK_PATH=/usr/src/gmock #1.6.0 from ubuntu trusty repo
+  - GMOCK_VER=1.7.0 
+  - GMOCK_PATH=/usr/src/gmock #1.6.0 from ubuntu trusty repo
+matrix:
+  exclude:
+    - os: osx
+      env: GMOCK_PATH=/usr/src/gmock
+    - os: osx
+      compiler: gcc #does anyone on osx use it?
 
 addons:
   apt:
@@ -25,3 +33,7 @@ script: ./travis.sh
 notifications:
   email:
     - cukes-devs@googlegroups.com
+
+branches:
+  only:
+    - master