Merge branch 'master' into september-cleanup
make_wram_labels doesn't need globals now
Merge pull request #8 from kanzure/september-cleanup

Minor wram.py fix