Cleaned up service and controller

Using ngResource and controller as syntax