Issue31

Fixed up the way that require.js was being used in the require.js test config and the test controllers and renamed to test-main.js.