Merge pull request #1 from ralphtheninja/master

Add Travis