Removing some debugging output
Merge branch 'develop' for release, yay
Merge branch 'master' into develop
Changing some sounds around.

This commit also includes sounds for a magic gem clear,
which isn't implemented just yet.
Scoring and scoring-noises changes.
Changing window size to 640x480 for now.

Some debug output was also removed.