changed some serializers around so it would return more suitable json for ember data