Initial rewriting of physics
Fixed and tested r- and x-dependence, spiral untested
Merge pull request #1 from snakerock/master

Initial rewriting of physics