add travis
Merge branch 'master' into travis
Merge pull request #11 from cjoelrun/travis

Travis