Merge pull request #4 from AzureusNation/master

Added Multiple Player mappings and code cleanup
Started on a command proxy. Still needs work.
Merge remote-tracking branch 'upstream/master'