adding .travis.yml file
Merge branch 'master' into travisCI
travis CI stuff in spec helper
fixed merge conflicts
Merge pull request #48 from edatrix/travisCI

Travis ci