Merge pull request #5 from twotoasters/chris-1-travis

Updated to work with Travis.