Merge pull request #14 from wroy/master

revmoing .userprefs file, updating gitignore
imporved mass and gravity/clipping physics