Changes to src, arcball hack
Merged
Refactored repo to work with OSX build