Options Menu
Merge remote-tracking branch 'anthony/swirlie' into changesForBeta
Added in escape menu and fixed up options menu along with player stuff