Changed function handling to account for new names, and future sind etc. functions
Merge branch 'ics' of github.com:Xlythe/android_packages_apps_Calculator into ics

Just get out of my way, github