Cleanup and problem fixes after last merge to master

Hi!

I've noticed some problems with the latest merge of requirejs-experiment-almond to master.

This pull request contains fixes and some cleanup of leftover stuff.