* Cherry picking changes from McZonk:
- Removed functions that really shouldn't have been in here in the first place
- Added param for button title for one button alerts
- Changed "Ok" to "OK".  Oops!
- Cleaned up .m