Merge pull request #17 from tbranyen/master

Hotfix: Messed up rebase, patched paths.
Added Travis-CI support.
Updated README with Travis-CI badge.
Merge pull request #18 from tbranyen/travis-ci

Travis ci