Shockwave cooldown is now reduced by 20 seconds when 3+ targets are hit, and any cooldown reduction trinket will be applied before this 20 second reduction.

git-svn-id: http://simulationcraft.googlecode.com/svn/trunk@18031 3b4652a1-8050-0410-ac47-3d40261b0f8b
Removed some unnecessary code from last commit.

git-svn-id: http://simulationcraft.googlecode.com/svn/trunk@18032 3b4652a1-8050-0410-ac47-3d40261b0f8b
Small compiler fix for r18030.

git-svn-id: http://simulationcraft.googlecode.com/svn/trunk@18033 3b4652a1-8050-0410-ac47-3d40261b0f8b