added collision code for avatar (not operational yet). and some cleanup.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changes from Philip's push - I assume