Merge pull request #9 from renstrom/master

Add Travis file.
Remove unnecessary else-statements.