Merge pull request #55 from jehiah/travis-ci_55

Enable travis-ci