Switch to using all aliases, rather than mix of alias and path

* Upgrading to require.js 2.1.4
* Fixing x-dependency issue in oae.api.util

Conflicts:
	shared/oae/api/oae.bootstrap.js