adding in cancan, plus some markup deletion
adding in cancan and rolify with basic roles