Merge pull request #910 from akoeplinger/cleanup-test-ignores

[Test] Cleaned up how a bunch of tests were ignored
added OSX travis branch