Cleanup and medic changes.

Removed some stuff I didn't really like and updated the medic ubercharge
stuff to look a little different.