Use better method of finding arcs.

This method draws the arcs in a more pleasing manner according to Dr. Zirbel.
Remove old code
Merge branches 'master' and 'develop'