Update testing framework for Travis
Merge pull request #11 from jwennerberg/normalized-testing

Update testing framework for Travis