OS X tests updated to work regardless of lib/include setup
Clean up all whitespace issues
Merge branch 'test-patches' of github.com:ohpauleez/terra into test-patches