Completed shaman for enhancement and elemental, minus totem effects.
Some additional restoration spells, hacked fixed the lack of maelstrom and echo of element auras.
Reorganized and uncommented the spells with just a cooldown and no aura.
Merge remote-tracking branch 'upstream/master'