Updated requirejs paths
merged
Working on enabling the server (all tasks but server and karma) working now