adds travis file
adds travis
Merge branch 'master' into travis
tries to fix travis
changes travis
Merge pull request #22 from cicadas-2014/travis

Travis