Revert "Testing travis"
Merge pull request #4 from LineOfAwesome/revert-3-dev

Revert "Testing travis"