Rebase onto master, use RequireJS for Jasmine tests