6.0 changes.

Some minor fixes and additions.
6.0 additions

Tidyup and a couple of additions from Daf.
Fixed Spaces

Save us from the space police.
Merge pull request #40 from arcadepro/dev

Some 6.0 Warrior changes.