Merge pull request #24 from ZomgPonies/master

Merge from Master
SyndiBomb Fix
Merge pull request #455 from Fox-McCloud/SyndiBomb-Fox

Syndi bomb fix
Merge pull request #25 from ZomgPonies/master

Merge From Master
Vamp Mode Specifications
Oops

Forgot the Chaplain...
Merge pull request #456 from Fox-McCloud/VampireModeFix

Vampire mode fix
Merge pull request #26 from ZomgPonies/master

Merge from Master
Music Updates
Merge pull request #457 from Fox-McCloud/Music-Updates

Music updates
Merge remote-tracking branch 'upstream/master'