Get RequireJS configuration tokenisation working

Also tidied up define calls