moved #defines to header file, other minor edits
Merge branch 'master' of https://github.com/philadelphiagamelab/Sonic