Added travis
Merge pull request #259 from Nyholm/master

Added travis