got angular stuff organisd a bit better so that we can do proper combining and mangling with uglify without breaking things