Merge in hacks with Jas

Now this has a 3d camera that can be operated by the mouse. Instant auto-whitecap mode