Fixing branching.
Merge branch 'teeezyt'
Merge branch 'master' of https://github.com/jcrawley/Spitfire