Merge pull request #1 from dogonthehorizon/master

Cleans up config files.
Merge pull request #4 from dogonthehorizon/master

Adds .travis.yml file.