Merge branch 'add-shield-speed' into 'master'

Add shield speed

Adds a 'shield' speed type, so 'quick' weapons will no longer make shield pummel faster.
Also makes room for a possible quick-acting shield ego/artifact.