Mark tests as incomplete
Fix TravisCI build
Remove annoyances from existing tests
Merge pull request #819 from dlsniper/fix-travis

Fix travis