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

Revert "Revert "Testing travis""