Cleaning up and modifiying for linux support
Merge branch 'master' of https://github.com/calebrob6/oscar

Merging
Adding the proper test cases that can be made with cmake