Well I thought I might as well commit as I have been working on it for about 4 hours today. The code has been changed about 28196754715 times (estimated by AskJeeves), but I have finally got everything how I want to to be and now I can work on the actual game.
Merge remote-tracking branch 'origin/master'