Mantis2920

Note that only the final commit in this branch is intended for trunk. Ignore the two merges (obviously :)) and ignore the JSON branch, that was only added here to make checking the pilot data easier.

(I guess when github becomes the primary repo this would need to be rebased or the relevant commit cherry-picked into a new branch before submitting the pull request)

Mantis ticket here:
http://scp.indiegames.us/mantis/view.php?id=2920