misc merge fixes from my local repo and Nico's repo
Misc spacing and formatting fixes.
Merge branch 'BleedingEdge' of git://github.com/ISeeDEDPpl/Questor into BleedingEdge